generator-reshow 0.17.60 → 0.17.62

package/generators/docker/templates/_circleci/config.yml

@@ -18,7 +18,10 @@ jobs:
       - run:
           name: "Test with terratest"
           command: |
-            go test -v ./tests
+            go test -timeout 30m -v ./tests | tee test_output.log
+            terratest_log_parser -testlog test_output.log -outputdir test_output
+      - store_test_results:
+          path: test_output
   build-and-publish:
     parameters:
       docker-tag:
@@ -53,10 +56,16 @@ jobs:
           name: build Docker image
           command: |
             VER_PREFIX=$(support/VER_PREFIX.sh)
+            VERSION=$(support/VERSION.sh)
+            ALT_VERSION=$(support/ALT_VERSION.sh)
             IMAGE_NAME=$(DOCKER_HUB=1 support/remoteImage.sh)
             BUILD_VERSION=<< parameters.docker-tag >>
             BUILD_FOLDER=${VER_PREFIX}-<< parameters.docker-tag >>
             BUILD_ARG=""
+            if [ "x$VERSION" == "x$BUILD_VERSION" ]; then
+                BUILD_ARG="--build-arg ALT_VERSION=${ALT_VERSION}"
+            fi
+            echo "Build ARGS: ${BUILD_ARG}"
             docker build ${BUILD_ARG} -f ${BUILD_FOLDER}/Dockerfile \
               -t $IMAGE_NAME:${BUILD_VERSION} \
               ./${BUILD_FOLDER}

package/generators/docker/templates/bin/enter.sh

@@ -19,7 +19,7 @@ containerName=${localImage//\//-}-${pid}
 
 echo $containerName
 
-cli='env docker run --rm -it'
+cli='env docker run --rm -it --platform linux/amd64'
 cli+=" -v $DIR/../docker/entrypoint.sh:/entrypoint.sh"
 cli+=" -v $MY_PWD:$MY_PWD"
 cli+=" -w $MY_PWD"

package/generators/docker/templates/bin/run.sh

@@ -9,7 +9,7 @@ localImage=$(${DIR}/../support/localImage.sh)
 pid=$$
 folderName=${PWD##*/}
 
-cli='env docker run --rm -it'
+cli='env docker run --rm -it --platform linux/amd64'
 cli+=" -v $DIR/../docker/entrypoint.sh:/entrypoint.sh"
 cli+=" --name ${folderName}-${pid} ${localImage}"
 echo $cli

package/generators/docker/templates/bin/test.sh

@@ -6,10 +6,10 @@ DIR="$(
 
 TERRATEST=$(${DIR}/../support/TERRATEST.sh)
 
-docker run --rm -v $DIR/../:/app/test \
+docker run --rm --platform linux/amd64 -v $DIR/../:/app/test \
   -v /var/run/docker.sock:/var/run/docker.sock \
   -w /app/test \
   $TERRATEST \
-  go test -v ./tests
+  go test -timeout 30m -v ./tests
 
 

package/generators/docker/templates/compile.sh

@@ -9,6 +9,7 @@ localImage=$(${DIR}/support/localImage.sh)
 remoteImage=$(${DIR}/support/remoteImage.sh)
 archiveFile=$DIR/archive.tar
 VERSION=$(${DIR}/support/VERSION.sh)
+ALT_VERSION=$(${DIR}/support/ALT_VERSION.sh)
 DOCKER_FILE=${DOCKER_FILE:-Dockerfile}
 
 list() {

package/generators/docker/templates/support/ALT_VERSION.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+DIR="$(
+  cd "$(dirname "$0")"
+  pwd -P
+)"
+
+if [ -z $ALT_VERSION ]; then
+  ALT_VERSION=$(awk -F "=" '/^ALT_VERSION/ {print $2}' ${DIR}/../.env.build)
+fi
+
+echo $ALT_VERSION

package/generators/gitlab-docker/templates/.gitlab-ci.yml

@@ -36,7 +36,11 @@ pre-test:
   stage: test
   image: $CI_TERRATEST
   script:
-    - go test -v ./tests
+    - go test -v ./tests | tee test_output.log
+    - terratest_log_parser -testlog test_output.log -outputdir test_output
+  artifacts:
+    reports:
+      junit: ./test_output/report.xml
 
 build-docker-image:
   extends: .parallel

package/generators/package-json/templates/package.json

@@ -38,6 +38,7 @@
     "build": "npm run clean && npm run build:cjs && npm run build:es && npm run build:type",
     "mochaFor": "STRICT_MODE=on mocha -r global-jsdom/register",
     "mocha": "npm run mochaFor -- 'build/{cjs,es}/**/__tests__/*.{js,mjs}'",
+    "test:report": "npm run build && npm run mochaFor -- --reporter mocha-junit-reporter --reporter-options mochaFile=./test_output/mocha.xml 'build/{cjs,es}/**/__tests__/*.{js,mjs}'",
     "test": "npm run build && npm run mocha",
     "prepublishOnly": "npm run test"
   },

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.17.60",
+  "version": "0.17.62",
   "name": "generator-reshow",
   "repository": {
     "type": "git",