Split out base and toolchain and ensure CI tests the current PR

.github/workflows/build_images.yml

@@ -17,61 +17,86 @@ jobs:
           export VERSION=$(cat .golang_version | awk -F',' '{print $1}' | sed 's/go1/go-1/')
           DOTS=$(echo -n $VERSION | awk -F"." '{print NF-1}')
           if [ "$DOTS" == "1" ]; then
-            echo ::set-output name=value::$VERSION.0
-            echo ::set-output name=wildcard::$VERSION.x
+            echo "value=$VERSION.0" >> $GITHUB_OUTPUT
+            echo "wildcard=$VERSION.x" >> $GITHUB_OUTPUT
           else
-            echo ::set-output name=value::$VERSION
-            echo ::set-output name=wildcard::$(echo -n $VERSION | sed 's/\.[^.]*$/.x/')
+           echo "value=$VERSION" >> $GITHUB_OUTPUT
+            echo "wildcard=$(echo -n $VERSION | sed 's/\.[^.]*$/.x/')" >> $GITHUB_OUTPUT
           fi
         id: golang_version_1
       - name: get golang version 2
         run: |
           export VERSION=$(cat .golang_version | awk -F',' '{print $2}' | sed 's/go1/go-1/')
           DOTS=$(echo -n $VERSION | awk -F"." '{print NF-1}')
           if [ "$DOTS" == "1" ]; then
-            echo ::set-output name=value::$VERSION.0
-            echo ::set-output name=wildcard::$VERSION.x
+            echo "value=$VERSION.0" >> $GITHUB_OUTPUT
+            echo "wildcard=$VERSION.x" >> $GITHUB_OUTPUT
           else
-            echo ::set-output name=value::$VERSION
-            echo ::set-output name=wildcard::$(echo -n $VERSION | sed 's/\.[^.]*$/.x/')
+           echo "value=$VERSION" >> $GITHUB_OUTPUT
+            echo "wildcard=$(echo -n $VERSION | sed 's/\.[^.]*$/.x/')" >> $GITHUB_OUTPUT
           fi
         id: golang_version_2
-      - name: get if base should be built
+      - name: get if toolchain should be built
         run: |
-          export VAL=$(git diff-tree --no-commit-id --name-only -r ${{ github.sha }} | grep "docker/base" | wc -l | awk '{print $1}')
+          export VAL=$(git diff-tree --no-commit-id --name-only -r ${{ github.sha }} | grep "docker/toolchain" | wc -l | awk '{print $1}')
           echo $VAL
-          echo ::set-output name=value::$(echo -n $VAL)
-        id: base_build
+          echo "value=$(echo -n $VAL)" >> $GITHUB_OUTPUT
+        id: toolchain_build
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       - name: Login to Docker Hub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: build base image
+      - name: build toolchain image
         uses: docker/build-push-action@v2
-        # if: steps.base_build.outputs.value != '0'
-        if: true
+        if: steps.toolchain_build.outputs.value != '0'
         with:
-          context: docker/base/
-          tags: techknowlogick/xgo:base
+          context: docker/toolchain/
+          tags: techknowlogick/xgo:toolchain
           push: true
-          file: docker/base/Dockerfile
-      - name: build golang ${{ steps.golang_version_1.outputs.value }} image
+          file: docker/toolchain/Dockerfile
+      - name: build golang ${{ steps.golang_version_1.outputs.value }} image base
         uses: docker/build-push-action@v2
         with:
           context: docker/${{ steps.golang_version_1.outputs.value }}/
-          tags: techknowlogick/xgo:${{ steps.golang_version_1.outputs.value }},techknowlogick/xgo:${{ steps.golang_version_1.outputs.wildcard }}
+          tags: techknowlogick/xgo:${{ steps.golang_version_1.outputs.value }}-base
           push: true
           file: docker/${{ steps.golang_version_1.outputs.value }}/Dockerfile
+          build-contexts: |
+            toolchain=docker-image://techknowlogick/xgo:toolchain
+      - name: build golang ${{ steps.golang_version_1.outputs.value }} image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          tags: techknowlogick/xgo:${{ steps.golang_version_1.outputs.value }},techknowlogick/xgo:${{ steps.golang_version_1.outputs.wildcard }}
+          push: true
+          build-args: |
+            VERSION=${{ steps.golang_version_1.outputs.value }}
+          file: docker/build/Dockerfile
+          build-contexts: |
+            ${{ steps.golang_version_1.outputs.value }}-base=docker-image://techknowlogick/xgo:${{ steps.golang_version_1.outputs.value }}-base
       - name: build golang ${{ steps.golang_version_2.outputs.value }} image
         uses: docker/build-push-action@v2
         with:
           context: docker/${{ steps.golang_version_2.outputs.value }}/
-          tags: techknowlogick/xgo:${{ steps.golang_version_2.outputs.value }},techknowlogick/xgo:${{ steps.golang_version_2.outputs.wildcard }}
+          tags: techknowlogick/xgo:${{ steps.golang_version_2.outputs.value }}-base
           push: true
           file: docker/${{ steps.golang_version_2.outputs.value }}/Dockerfile
+          build-contexts: |
+            toolchain=docker-image://techknowlogick/xgo:toolchain
+      - name: build golang ${{ steps.golang_version_2.outputs.value }} image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          tags: techknowlogick/xgo:${{ steps.golang_version_2.outputs.value }},techknowlogick/xgo:${{ steps.golang_version_2.outputs.wildcard }}
+          push: true
+          build-args: |
+            VERSION=${{ steps.golang_version_2.outputs.value }}
+          file: docker/build/Dockerfile
+          build-contexts: |
+            ${{ steps.golang_version_2.outputs.value }}-base=docker-image://techknowlogick/xgo:${{ steps.golang_version_2.outputs.value }}-base
       - name: build latest image
         uses: docker/build-push-action@v2
         with:

.github/workflows/cron_generate_pr.yml

@@ -21,7 +21,7 @@ jobs:
         python3 generate_docker_images.py
 
     - name: Get golang version
-      run: echo ::set-output name=value::$(cat .golang_version)
+      run: echo "value=$(cat .golang_version)" >> $GITHUB_OUTPUT
       id: golang_version
 
     - name: Create Pull Request

.github/workflows/test_pr.yml

@@ -14,64 +14,75 @@ jobs:
           export VERSION=$(cat .golang_version | awk -F',' '{print $1}' | sed 's/go1/go-1/')
           DOTS=$(echo -n $VERSION | awk -F"." '{print NF-1}')
           if [ "$DOTS" == "1" ]; then
-            echo ::set-output name=value::$VERSION.0
-            echo ::set-output name=wildcard::$VERSION.x
+            echo "value=$VERSION.0" >> $GITHUB_OUTPUT
+            echo "wildcard=$VERSION.x" >> $GITHUB_OUTPUT
           else
-            echo ::set-output name=value::$VERSION
-            echo ::set-output name=wildcard::$(echo -n $VERSION | sed 's/\.[^.]*$/.x/')
+            echo "value=$VERSION" >> $GITHUB_OUTPUT
+            echo "wildcard=$(echo -n $VERSION | sed 's/\.[^.]*$/.x/')" >> $GITHUB_OUTPUT
           fi
         id: golang_version_1
       - name: get golang version 2
         run: |
           export VERSION=$(cat .golang_version | awk -F',' '{print $2}' | sed 's/go1/go-1/')
           DOTS=$(echo -n $VERSION | awk -F"." '{print NF-1}')
           if [ "$DOTS" == "1" ]; then
-            echo ::set-output name=value::$VERSION.0
-            echo ::set-output name=wildcard::$VERSION.x
+            echo "value=$VERSION.0" >> $GITHUB_OUTPUT
+            echo "wildcard=$VERSION.x" >> $GITHUB_OUTPUT
           else
-            echo ::set-output name=value::$VERSION
-            echo ::set-output name=wildcard::$(echo -n $VERSION | sed 's/\.[^.]*$/.x/')
+            echo "value=$VERSION" >> $GITHUB_OUTPUT
+            echo "wildcard=$(echo -n $VERSION | sed 's/\.[^.]*$/.x/')" >> $GITHUB_OUTPUT
           fi
         id: golang_version_2
-      - name: get if base should be built
-        run: |
-          export VAL=$(git diff-tree --no-commit-id --name-only -r ${{ github.sha }} | grep "docker/base" | wc -l | awk '{print $1}')
-          echo $VAL
-          echo ::set-output name=value::$(echo -n $VAL)
-        id: base_build
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: build base image
-        uses: docker/build-push-action@v2
-        # if: steps.base_build.outputs.value != '0'
-        if: true
-        with:
-          context: docker/base/
-          tags: techknowlogick/xgo:base
-          push: false
-          file: docker/base/Dockerfile
-      - name: build golang ${{ steps.golang_version_1.outputs.value }} image
-        uses: docker/build-push-action@v2
-        with:
-          context: docker/${{ steps.golang_version_1.outputs.value }}/
-          tags: techknowlogick/xgo:${{ steps.golang_version_1.outputs.value }},techknowlogick/xgo:${{ steps.golang_version_1.outputs.wildcard }},techknowlogick/xgo:latest
-          push: false
-          file: docker/${{ steps.golang_version_1.outputs.value }}/Dockerfile
-          load: true
-      - name: build golang ${{ steps.golang_version_2.outputs.value }} image
-        uses: docker/build-push-action@v2
-        with:
-          context: docker/${{ steps.golang_version_2.outputs.value }}/
-          tags: techknowlogick/xgo:${{ steps.golang_version_2.outputs.value }},techknowlogick/xgo:${{ steps.golang_version_2.outputs.wildcard }}
-          push: false
-          file: docker/${{ steps.golang_version_2.outputs.value }}/Dockerfile
       - name: Setup BATS
         uses: mig4/setup-bats@v1
         with:
           bats-version: 1.2.1
-      - name: run BATS tests
+      - name: cache toolchain
+        id: cache-toolchain
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-toolchain
+        with:
+          path: /tmp/toolchain.tar
+          key: ${{ runner.os }}-toolchain-${{ hashFiles('docker/toolchain/**') }}
+      - if: ${{ steps.cache-toolchain.outputs.cache-hit != 'true' }}
+        name: build toolchain
+        run: |
+          echo "Build toolchain docker"
+          docker buildx build --file docker/toolchain/Dockerfile \
+            --tag toolchain --load docker/toolchain/
+          docker save -o /tmp/toolchain.tar toolchain
+      - name: build images and tests
         run: |
+          echo "Load toolchain docker"
+          docker load -i /tmp/toolchain.tar
+
+          echo "Bootstrap go ${{ steps.golang_version_1.outputs.value }}"
+          docker buildx build --file docker/${{ steps.golang_version_1.outputs.value }}/Dockerfile \
+            --tag ${{ steps.golang_version_1.outputs.value }}-base --load docker/${{ steps.golang_version_1.outputs.value }}/
+
+          echo "Build xgo for go ${{ steps.golang_version_1.outputs.value }} "
+          docker buildx build --file docker/build/Dockerfile \
+            --tag techknowlogick/xgo:${{ steps.golang_version_1.outputs.value }} \
+            --tag techknowlogick/xgo:${{ steps.golang_version_1.outputs.wildcard }} \
+            --tag techknowlogick/xgo:latest \
+            --build-arg VERSION=${{ steps.golang_version_1.outputs.value }} \
+            --load .
+
+          echo "Bootstrap go ${{ steps.golang_version_2.outputs.value }}"
+          docker buildx build --file docker/${{ steps.golang_version_2.outputs.value }}/Dockerfile \
+            --tag ${{ steps.golang_version_2.outputs.value }}-base --load docker/${{ steps.golang_version_2.outputs.value }}/
+
+          echo "Build xgo for go ${{ steps.golang_version_2.outputs.value }}"
+          docker buildx build --file docker/build/Dockerfile \
+            --tag techknowlogick/xgo:${{ steps.golang_version_2.outputs.value }} \
+            --tag techknowlogick/xgo:${{ steps.golang_version_2.outputs.wildcard }} \
+            --build-arg VERSION=${{ steps.golang_version_2.outputs.value }} \
+            --load .
+
           mkdir -p .xgo-cache
           mkdir -p ~/go/src
-          bats xgo.bats
+
+          echo "Run tests on latest go ${{ steps.golang_version_1.outputs.value }}"
+          env IMAGEID="techknowlogick/xgo:${{ steps.golang_version_1.outputs.value }}" bats xgo.bats
 

docker/build/Dockerfile

@@ -0,0 +1,31 @@
+# Go cross compiler (xgo): Base cross-compilation layer
+# Copyright (c) 2014 Péter Szilágyi. All rights reserved.
+#
+# Released under the MIT license.
+ARG VERSION=latest
+FROM ${VERSION}-base
+
+LABEL maintainer="techknowlogick <[email protected]>"
+
+COPY go.mod /xgo-src/
+COPY xgo.go /xgo-src/
+
+# Mark the image as xgo enabled to support xgo-in-xgo
+ENV XGO_IN_XGO 1
+
+# Install xgo within the container to enable internal cross compilation
+WORKDIR /xgo-src
+RUN \
+  echo "Installing xgo-in-xgo..." && \
+  go install xgo.go && \
+  ln -s /go/bin/xgo /usr/bin/xgo && \
+  rm -r /xgo-src
+
+WORKDIR /
+
+# Inject the container entry point, the build script
+COPY docker/build/build.sh /build.sh
+ENV BUILD /build.sh
+RUN chmod +x "$BUILD"
+
+ENTRYPOINT ["/build.sh"]

docker/base/build.sh → docker/build/build.sh

@@ -160,18 +160,25 @@ shopt -u nullglob
 # Configure some global build parameters
 NAME="$OUT"
 
+
 if [ "$NAME" == "" ]; then
   if [[ "$USEMODULES" = true && -d /source && -f /source/go.mod ]]; then
-    # Go module-based builds error with 'cannot find main module'
-    # when $PACK is defined
     NAME="$(sed -n 's/module\ \(.*\)/\1/p' /source/go.mod)"
+
+    if [[ "$NAME" != "" && "$PACK" != "" ]]; then
+      NAME="$NAME/$PACK"
+    fi
   fi
 fi
 
-if [ "$NAME" == "" ]; then
+if [[ "$NAME" == "" ]]; then
   NAME="$(basename "$1/$PACK")"
 fi
 
+if [[ "$NAME" == "" || "$NAME" == "." ]]; then
+  NAME="main"
+fi
+
 # Support go module package
 PACK_RELPATH="./$PACK"
 

docker/go-1.18.10/Dockerfile

@@ -1,5 +1,5 @@
 ## GENERATED. DO NOT EDIT DIRECTLY.
-FROM techknowlogick/xgo:base
+FROM toolchain
 
 ENV GO_VERSION 11810
 

docker/go-1.18.x/Dockerfile

@@ -1,2 +1,2 @@
 ## GENERATED. DO NOT EDIT DIRECTLY.
-FROM techknowlogick/xgo:go-1.18.10
+FROM go-1.18.10

docker/go-1.19.5/Dockerfile

@@ -1,5 +1,5 @@
 ## GENERATED. DO NOT EDIT DIRECTLY.
-FROM techknowlogick/xgo:base
+FROM toolchain
 
 ENV GO_VERSION 1195
 

docker/go-1.19.x/Dockerfile

@@ -1,2 +1,2 @@
 ## GENERATED. DO NOT EDIT DIRECTLY.
-FROM techknowlogick/xgo:go-1.19.5
+FROM go-1.19.5