Refactor (ci): Use $GITHUB_ENV, github.ref_name, and bump actions…

… to node 16
startersclan · Nov 4, 2022 · 55b7194 · 55b7194
1 parent 9543741
commit 55b7194
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 62 deletions.
diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Test (integration)
       run: |
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Display system info (linux)
       run: |
@@ -44,14 +44,14 @@ jobs:
 
     # See: https://github.com/docker/build-push-action/blob/v2.6.1/docs/advanced/cache.md#github-cache
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
 
     - name: Set up Docker Buildx
       id: buildx
       uses: docker/setup-buildx-action@master
 
     - name: Cache Docker layers
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: /tmp/.buildx-cache
         key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -60,34 +60,25 @@ jobs:
 
     - name: Prepare
       id: prep
-      env:
-        DOCKERHUB_REGISTRY_USER: ${{ secrets.DOCKERHUB_REGISTRY_USER }}
       run: |
         set -e
 
         # Get 'namespace' and 'project-name' from 'namespace/project-name'
         CI_PROJECT_NAMESPACE=$( echo "${{ github.repository }}" | cut -d '/' -f 1 | tr '[:upper:]' '[:lower:]' ) # Lowercase
         CI_PROJECT_NAME=$( echo "${{ github.repository }}" | cut -d '/' -f 2 | tr '[:upper:]' '[:lower:]' ) # Lowercase
 
-        # Get <branch_name> from refs/heads/<branch_name>, or <tag-name> from refs/tags/<tag_name>. E.g. . E.g. 'master', 'v1.2.3'
+
+        # Get ref, i.e. <branch_name> from refs/heads/<branch_name>, or <tag-name> from refs/tags/<tag_name>. E.g. 'master' or 'v1.2.3'
         REF=$( echo "${GITHUB_REF}" | rev | cut -d '/' -f 1 | rev )
+
         # Get commit hash E.g. 'b29758a'
         SHA_SHORT=$( echo "${GITHUB_SHA}" | cut -c1-7 )
 
-        # Generate the final tags. E.g. 'master-v1.0.0-alpine' and 'master-b29758a-v1.0.0-alpine'
-        VARIANT_TAG_WITH_REF="${REF}"
-        VARIANT_TAG_WITH_REF_AND_SHA_SHORT="${REF}-${SHA_SHORT}"
-
-        # Set step output(s)
-        echo "::set-output name=CI_PROJECT_NAMESPACE::$CI_PROJECT_NAMESPACE"
-        echo "::set-output name=CI_PROJECT_NAME::$CI_PROJECT_NAME"
-        # echo "::set-output name=REF::$REF"
-        # echo "::set-output name=SHA_SHORT::$SHA_SHORT"
-        # echo "::set-output name=REF_AND_SHA_SHORT::$REF_AND_SHA_SHORT"
-        # echo "::set-output name=CONTEXT::$VARIANT_BUILD_DIR"
-        echo "::set-output name=VARIANT_TAG::$VARIANT_TAG"
-        echo "::set-output name=VARIANT_TAG_WITH_REF::$VARIANT_TAG_WITH_REF"
-        echo "::set-output name=VARIANT_TAG_WITH_REF_AND_SHA_SHORT::$VARIANT_TAG_WITH_REF_AND_SHA_SHORT"
+        # Pass variables to next step
+        echo "CI_PROJECT_NAMESPACE=$CI_PROJECT_NAMESPACE" >> $GITHUB_ENV
+        echo "CI_PROJECT_NAME=$CI_PROJECT_NAME" >> $GITHUB_ENV
+        echo "REF=$REF" >> $GITHUB_ENV
+        echo "SHA_SHORT=$SHA_SHORT" >> $GITHUB_ENV
 
     - name: Login to docker registry
       if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')
@@ -100,92 +91,92 @@ jobs:
       id: docker_build_pr_nginx
       # Run only on pull requests
       if: github.event_name == 'pull_request'
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v3
       with:
         file: Dockerfile.nginx.prod
-        context: ${{ steps.prep.outputs.CONTEXT }}
+        context: '.'
         platforms: linux/amd64
         push: false
         tags: |
-          ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF }}-nginx
-          ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF_AND_SHA_SHORT }}-nginx
+          ${{ env.CI_PROJECT_NAMESPACE }}/{{ env.CI_PROJECT_NAME }}:${{ env.REF }}-nginx
+          ${{ env.CI_PROJECT_NAMESPACE }}/{{ env.CI_PROJECT_NAME }}:${{ env.REF }}-${{ env.SHA_SHORT }}-nginx
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache
     - name: Build php (PRs)
       id: docker_build_pr_php
       # Run only on pull requests
       if: github.event_name == 'pull_request'
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v3
       with:
         file: Dockerfile.php.prod
-        context: ${{ steps.prep.outputs.CONTEXT }}
+        context: '.'
         platforms: linux/amd64
         push: false
         tags: |
-          ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF }}-php
-          ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF_AND_SHA_SHORT }}-php
+          ${{ env.CI_PROJECT_NAMESPACE }}/{{ env.CI_PROJECT_NAME }}:${{ env.REF }}-php
+          ${{ env.CI_PROJECT_NAMESPACE }}/{{ env.CI_PROJECT_NAME }}:${{ env.REF }}-${{ env.SHA_SHORT }}-php
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache
 
     - name: Build and push nginx (master)
       id: docker_build_master_nginx
       # Run only on master
       if: github.ref == 'refs/heads/master'
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v3
       with:
         file: Dockerfile.nginx.prod
-        context: ${{ steps.prep.outputs.CONTEXT }}
+        context: '.'
         platforms: 'linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x'
         push: true
         tags: |
-          ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:nginx
-          ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF }}-nginx
-          ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF_AND_SHA_SHORT }}-nginx
+          ${{ env.CI_PROJECT_NAMESPACE }}/{{ env.CI_PROJECT_NAME }}:nginx
+          ${{ env.CI_PROJECT_NAMESPACE }}/{{ env.CI_PROJECT_NAME }}:${{ env.REF }}-nginx
+          ${{ env.CI_PROJECT_NAMESPACE }}/{{ env.CI_PROJECT_NAME }}:${{ env.REF }}-${{ env.SHA_SHORT }}-nginx
         cache-to: type=local,dest=/tmp/.buildx-cache
     - name: Build and push php (master)
       id: docker_build_master_php
       # Run only on master
       if: github.ref == 'refs/heads/master'
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v3
       with:
         file: Dockerfile.php.prod
-        context: ${{ steps.prep.outputs.CONTEXT }}
+        context: '.'
         platforms: 'linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x'
         push: true
         tags: |
-          ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:php
-          ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF }}-php
-          ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF_AND_SHA_SHORT }}-php
+          ${{ env.CI_PROJECT_NAMESPACE }}/{{ env.CI_PROJECT_NAME }}:php
+          ${{ env.CI_PROJECT_NAMESPACE }}/{{ env.CI_PROJECT_NAME }}:${{ env.REF }}-php
+          ${{ env.CI_PROJECT_NAMESPACE }}/{{ env.CI_PROJECT_NAME }}:${{ env.REF }}-${{ env.SHA_SHORT }}-php
         cache-to: type=local,dest=/tmp/.buildx-cache
 
     - name: Build and push nginx(release)
       id: docker_build_release_nginx
       if: startsWith(github.ref, 'refs/tags/')
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v3
       with:
         file: Dockerfile.nginx.prod
-        context: ${{ steps.prep.outputs.CONTEXT }}
+        context: '.'
         platforms: 'linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x'
         push: true
         tags: |
-          ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:nginx
-          ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF }}-nginx
-          ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF_AND_SHA_SHORT }}-nginx
+          ${{ env.CI_PROJECT_NAMESPACE }}/{{ env.CI_PROJECT_NAME }}:nginx
+          ${{ env.CI_PROJECT_NAMESPACE }}/{{ env.CI_PROJECT_NAME }}:${{ env.REF }}-nginx
+          ${{ env.CI_PROJECT_NAMESPACE }}/{{ env.CI_PROJECT_NAME }}:${{ env.REF }}-${{ env.SHA_SHORT }}-nginx
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache
     - name: Build and push php (release)
       id: docker_build_release_php
       if: startsWith(github.ref, 'refs/tags/')
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v3
       with:
         file: Dockerfile.php.prod
-        context: ${{ steps.prep.outputs.CONTEXT }}
+        context: '.'
         platforms: 'linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x'
         push: true
         tags: |
-          ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:php
-          ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF }}-php
-          ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF_AND_SHA_SHORT }}-php
+          ${{ env.CI_PROJECT_NAMESPACE }}/{{ env.CI_PROJECT_NAME }}:php
+          ${{ env.CI_PROJECT_NAMESPACE }}/{{ env.CI_PROJECT_NAME }}:${{ env.REF }}-php
+          ${{ env.CI_PROJECT_NAMESPACE }}/{{ env.CI_PROJECT_NAME }}:${{ env.REF }}-${{ env.SHA_SHORT }}-php
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache
 
@@ -197,11 +188,10 @@ jobs:
       if: always()
 
   update-draft-release:
-    needs: [build]
+    needs: [test, build]
     if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
       # Drafts your next Release notes as Pull Requests are merged into "master"
       - uses: release-drafter/release-drafter@v5
         with:
@@ -211,23 +201,16 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   publish-draft-release:
-    needs: [build]
+    needs: [test, build]
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Resolve tag
-        id: resolve-tag
-        run: |
-          # Get <branch_name> from refs/heads/<branch_name>, or <tag-name> from refs/tags/<tag_name>. E.g. . E.g. 'master', 'v1.2.3'
-          REF=$( echo "${GITHUB_REF}" | rev | cut -d '/' -f 1 | rev )
-          echo "::set-output name=REF::$REF"
       # Drafts your next Release notes as Pull Requests are merged into "master"
       - uses: release-drafter/release-drafter@v5
         with:
           config-name: release-drafter.yml
           publish: true
-          name: ${{ steps.resolve-tag.outputs.REF }}
-          tag: ${{ steps.resolve-tag.outputs.REF }}
+          name: ${{ github.ref_name }} # E.g. 'master' or 'v1.2.3'
+          tag: ${{ github.ref_name }} # E.g. 'master' or 'v1.2.3'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,7 @@
+{
+    "files.associations": {
+        "*.ai": "bat",
+        "*.ai.add": "bat",
+        "*.con": "ini",
+    },
+}
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ The new BF2Statistics 3.0 ASP, currently in public Beta. The GameSpy server to m
 
 ## Usage
 
-```
+```sh
 docker pull startersclan/asp:3.1.0-nginx
 docker pull startersclan/asp:3.1.0-php
 ```