Revert

ocadotechnology · Feb 17, 2023 · fa5dfbd · fa5dfbd
1 parent 7aeed25
commit fa5dfbd
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 69 deletions.
diff --git a/.github/workflows/publish-docker-images.yml b/.github/workflows/publish-docker-images.yml
@@ -9,70 +9,68 @@ jobs:
 #    if: github.event.head_commit.author.email == 'action@github.com'
     runs-on: ubuntu-20.04
     steps:
-      - name: Expose git commit data
-        uses: rlespinasse/git-commit-data-action@v1
-#      - name: Checkout
-#        uses: actions/checkout@v3
-#      - name: Set up QEMU
-#        uses: docker/setup-qemu-action@v2
-#      - name: Set up Docker Buildx
-#        uses: docker/setup-buildx-action@v2
-#      - name: Cache Docker layers
-#        uses: actions/cache@v3
-#        with:
-#          path: /tmp/.buildx-cache
-#          key: ${{ runner.os }}-buildx-${{ github.sha }}
-#          restore-keys: |
-#            ${{ runner.os }}-buildx-
-#      - name: Login to DockerHub
-#        uses: docker/login-action@v2
-#        with:
-#          username: ${{ secrets.DOCKERHUB_USERNAME }}
-#          password: ${{ secrets.DOCKERHUB_TOKEN }}
-#      - name: Set docker tag
-#        id: docker_tag
-#        run: |
-#          echo "::set-output name=tag::${GITHUB_REF:11}"  # this is either branch name or tag after first character ('v')
-#      - name: Build and push aimmo-game image
-#        id: game
-#        uses: docker/build-push-action@v3
-#        with:
-#          context: aimmo-game
-#          file: aimmo-game/Dockerfile
-#          tags: ocadotechnology/aimmo-game:${{ steps.docker_tag.outputs.tag }}
-#          target: runner
-#          push: true
-#          cache-from: type=local,src=/tmp/.buildx-cache
-#          cache-to: type=local,dest=/tmp/.buildx-cache
-#      - name: Build and push aimmo-game-creator image
-#        id: game_creator
-#        uses: docker/build-push-action@v3
-#        with:
-#          context: aimmo-game-creator
-#          file: aimmo-game-creator/Dockerfile
-#          tags: ocadotechnology/aimmo-game-creator:${{ steps.docker_tag.outputs.tag }}
-#          target: runner
-#          push: true
-#          cache-from: type=local,src=/tmp/.buildx-cache
-#          cache-to: type=local,dest=/tmp/.buildx-cache
-#      - name: Image digest
-#        run: |
-#          echo ${{ steps.game.outputs.digest }}
-#          echo ${{ steps.game_creator.outputs.digest }}
-#
-#  trigger-staging-deployment:
-#    name: Trigger staging deployment
-#    needs: [publish-docker-images]
-#    runs-on: ubuntu-20.04
-#    steps:
-#      - name: Trigger staging deployment
-#        uses: actions/github-script@v6
-#        with:
-#          github-token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
-#          script: |
-#            github.rest.actions.createWorkflowDispatch({
-#              owner: 'ocadotechnology',
-#              repo: 'codeforlife-deploy-appengine',
-#              workflow_id: 'deploy_staging.yml',
-#              ref: 'master',
-#            });
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Set docker tag
+        id: docker_tag
+        run: |
+          echo "::set-output name=tag::${GITHUB_REF:11}"  # this is either branch name or tag after first character ('v')
+      - name: Build and push aimmo-game image
+        id: game
+        uses: docker/build-push-action@v3
+        with:
+          context: aimmo-game
+          file: aimmo-game/Dockerfile
+          tags: ocadotechnology/aimmo-game:${{ steps.docker_tag.outputs.tag }}
+          target: runner
+          push: true
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+      - name: Build and push aimmo-game-creator image
+        id: game_creator
+        uses: docker/build-push-action@v3
+        with:
+          context: aimmo-game-creator
+          file: aimmo-game-creator/Dockerfile
+          tags: ocadotechnology/aimmo-game-creator:${{ steps.docker_tag.outputs.tag }}
+          target: runner
+          push: true
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+      - name: Image digest
+        run: |
+          echo ${{ steps.game.outputs.digest }}
+          echo ${{ steps.game_creator.outputs.digest }}
+
+  trigger-staging-deployment:
+    name: Trigger staging deployment
+    needs: [publish-docker-images]
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Trigger staging deployment
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
+          script: |
+            github.rest.actions.createWorkflowDispatch({
+              owner: 'ocadotechnology',
+              repo: 'codeforlife-deploy-appengine',
+              workflow_id: 'deploy_staging.yml',
+              ref: 'master',
+            });
diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml
@@ -10,8 +10,6 @@ jobs:
     env:
       LANG: C.UTF-8
     steps:
-      - name: Expose git commit data
-        uses: rlespinasse/git-commit-data-action@v1
       - name: Checkout
         uses: actions/checkout@v3
         with: