From c96f58d66ce81911cf43a256acc2efbafb24fe1d Mon Sep 17 00:00:00 2001
From: adamws <adamws@users.noreply.github.com>
Date: Sat, 4 Nov 2023 12:05:16 +0100
Subject: [PATCH] test

---
 .github/workflows/build.yml | 129 +++++++++++++++---------------------
 1 file changed, 52 insertions(+), 77 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 56ff8db..21bf959 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,84 +8,59 @@ env:
   CARGO_TERM_COLOR: always
   IMAGE_NAME: svgdiff
 
-    #jobs:
-    #  build_image:
-    #    name: Build image
-    #    runs-on: ubuntu-latest
-    #    steps:
-    #      - uses: actions/checkout@v3
-    #      - name: Set up Docker Buildx
-    #        uses: docker/setup-buildx-action@v3
-    #      - name: Build and export
-    #        uses: docker/build-push-action@v5
-    #        with:
-    #          context: .
-    #          file: ./docker/Dockerfile
-    #          tags: myimage:latest
-    #          outputs: type=docker,dest=/tmp/myimage.tar
-            #      - name: Upload artifact
-            #        uses: actions/upload-artifact@v3
-            #        with:
-            #          name: myimage
-            #          path: /tmp/myimage.tar
-
-            #  build_and_test:
-            #    name: Rust project - latest
-            #    needs: build_image
-            #    runs-on: ubuntu-latest
-            #    strategy:
-            #      matrix:
-            #        toolchain:
-            #          - stable
-            #          - beta
-            #          - nightly
-            #    steps:
-            #      - name: Download artifact
-            #        uses: actions/download-artifact@v3
-            #        with:
-            #          name: myimage
-            #          path: /tmp
-            #      - name: Load image
-            #        run: |
-            #          docker load --input /tmp/myimage.tar
-            #          docker image ls -a
-            #      - uses: actions/checkout@v3
-            #      - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
-            #      - run: cargo build --verbose
-            #      - run: cargo test --verbose
-
 jobs:
-  # This pushes the image to GitHub Packages.
-  push:
+  build_and_test:
+    name: Rust project - latest
     runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
-    defaults:
-      run:
-        working-directory: ./docker
+    container:
+      image: ghcr.io/${{ github.repository_owner }}/svgdiff:latest
+      credentials:
+         username: ${{ github.actor }}
+         password: ${{ secrets.github_token }}
+    strategy:
+      matrix:
+        toolchain:
+          - stable
+          - beta
+          - nightly
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
+      - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
+      - run: cargo build --verbose
+      - run: cargo test --verbose
 
-      - name: Build image
-        run: docker build . --file Dockerfile --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
-
-      - name: Log in to registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
-        #
-      - name: Push image
-        run: |
-          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
-
-          # This changes all uppercase characters to lowercase.
-          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-          # This strips the git ref prefix from the version.
-          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-          # This strips the "v" prefix from the tag name.
-          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
-          # This uses the Docker `latest` tag convention.
-          [ "$VERSION" == "master" ] && VERSION=latest
-          echo IMAGE_ID=$IMAGE_ID
-          echo VERSION=$VERSION
-          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
-          docker push $IMAGE_ID:$VERSION
+    #jobs:
+    #  # This pushes the image to GitHub Packages.
+    #  push:
+    #    runs-on: ubuntu-latest
+    #    permissions:
+    #      packages: write
+    #      contents: read
+    #    defaults:
+    #      run:
+    #        working-directory: ./docker
+    #    steps:
+    #      - uses: actions/checkout@v4
+    #
+    #      - name: Build image
+    #        run: docker build . --file Dockerfile --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
+    #
+    #      - name: Log in to registry
+    #        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
+    #
+    #      - name: Push image
+    #        run: |
+    #          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
+    #
+    #          # This changes all uppercase characters to lowercase.
+    #          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+    #          # This strips the git ref prefix from the version.
+    #          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+    #          # This strips the "v" prefix from the tag name.
+    #          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+    #          # This uses the Docker `latest` tag convention.
+    #          [ "$VERSION" == "master" ] && VERSION=latest
+    #          echo IMAGE_ID=$IMAGE_ID
+    #          echo VERSION=$VERSION
+    #          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
+    #          docker push $IMAGE_ID:$VERSION