Merge pull request #106 from startersclan/enhancement/add-bf2stats-2.…

…6.0-and-bf2stats-3.3.0-variants Enhancement: Add bf2stats 2.6.0 and bf2stats 3.3.0 variants
startersclan · Nov 22, 2023 · 1ffa788 · 1ffa788
2 parents fef2496 + 7f6d46f
commit 1ffa788
Show file tree

Hide file tree

Showing 39 changed files with 7,088 additions and 12 deletions.
diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml
@@ -547,6 +547,73 @@ jobs:
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
+    # This step generates the docker tags
+    - name: Prepare
+      id: prep-v1-5-3153-0-bf2all64-bf2stats-2-6-0
+      run: |
+        set -e
+
+        # Get ref, i.e. <branch_name> from refs/heads/<branch_name>, or <tag-name> from refs/tags/<tag_name>. E.g. 'master' or 'v0.0.0'
+        REF=$( echo "${GITHUB_REF}" | rev | cut -d '/' -f 1 | rev )
+
+        # Get short commit hash E.g. 'abc0123'
+        SHA=$( echo "${GITHUB_SHA}" | cut -c1-7 )
+
+        # Generate docker image tags
+        # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
+        # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
+        VARIANT="v1.5.3153.0-bf2all64-bf2stats-2.6.0"
+        REF_VARIANT="${REF}-${VARIANT}"
+        REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
+
+        # Pass variables to next step
+        echo "VARIANT_BUILD_DIR=$VARIANT_BUILD_DIR" >> $GITHUB_OUTPUT
+        echo "VARIANT=$VARIANT" >> $GITHUB_OUTPUT
+        echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
+        echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
+
+    - name: v1.5.3153.0-bf2all64-bf2stats-2.6.0 - Build (PRs)
+      # Run only on pull requests
+      if: github.event_name == 'pull_request'
+      uses: docker/build-push-action@v3
+      with:
+        context: variants/v1.5.3153.0-bf2all64-bf2stats-2.6.0
+        platforms: linux/386,linux/amd64
+        push: false
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2all64-bf2stats-2-6-0.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2all64-bf2stats-2-6-0.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    - name: v1.5.3153.0-bf2all64-bf2stats-2.6.0 - Build and push (master)
+      # Run only on master
+      if: github.ref == 'refs/heads/master'
+      uses: docker/build-push-action@v3
+      with:
+        context: variants/v1.5.3153.0-bf2all64-bf2stats-2.6.0
+        platforms: linux/386,linux/amd64
+        push: true
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2all64-bf2stats-2-6-0.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2all64-bf2stats-2-6-0.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    - name: v1.5.3153.0-bf2all64-bf2stats-2.6.0 - Build and push (release)
+      if: startsWith(github.ref, 'refs/tags/')
+      uses: docker/build-push-action@v3
+      with:
+        context: variants/v1.5.3153.0-bf2all64-bf2stats-2.6.0
+        platforms: linux/386,linux/amd64
+        push: true
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2all64-bf2stats-2-6-0.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2all64-bf2stats-2-6-0.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2all64-bf2stats-2-6-0.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
     # This step generates the docker tags
     - name: Prepare
       id: prep-v1-5-3153-0-bf2all64-bf2stats-3-1-0
@@ -748,6 +815,73 @@ jobs:
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
+    # This step generates the docker tags
+    - name: Prepare
+      id: prep-v1-5-3153-0-bf2all64-bf2stats-3-3-0
+      run: |
+        set -e
+
+        # Get ref, i.e. <branch_name> from refs/heads/<branch_name>, or <tag-name> from refs/tags/<tag_name>. E.g. 'master' or 'v0.0.0'
+        REF=$( echo "${GITHUB_REF}" | rev | cut -d '/' -f 1 | rev )
+
+        # Get short commit hash E.g. 'abc0123'
+        SHA=$( echo "${GITHUB_SHA}" | cut -c1-7 )
+
+        # Generate docker image tags
+        # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
+        # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
+        VARIANT="v1.5.3153.0-bf2all64-bf2stats-3.3.0"
+        REF_VARIANT="${REF}-${VARIANT}"
+        REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
+
+        # Pass variables to next step
+        echo "VARIANT_BUILD_DIR=$VARIANT_BUILD_DIR" >> $GITHUB_OUTPUT
+        echo "VARIANT=$VARIANT" >> $GITHUB_OUTPUT
+        echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
+        echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
+
+    - name: v1.5.3153.0-bf2all64-bf2stats-3.3.0 - Build (PRs)
+      # Run only on pull requests
+      if: github.event_name == 'pull_request'
+      uses: docker/build-push-action@v3
+      with:
+        context: variants/v1.5.3153.0-bf2all64-bf2stats-3.3.0
+        platforms: linux/386,linux/amd64
+        push: false
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2all64-bf2stats-3-3-0.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2all64-bf2stats-3-3-0.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    - name: v1.5.3153.0-bf2all64-bf2stats-3.3.0 - Build and push (master)
+      # Run only on master
+      if: github.ref == 'refs/heads/master'
+      uses: docker/build-push-action@v3
+      with:
+        context: variants/v1.5.3153.0-bf2all64-bf2stats-3.3.0
+        platforms: linux/386,linux/amd64
+        push: true
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2all64-bf2stats-3-3-0.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2all64-bf2stats-3-3-0.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    - name: v1.5.3153.0-bf2all64-bf2stats-3.3.0 - Build and push (release)
+      if: startsWith(github.ref, 'refs/tags/')
+      uses: docker/build-push-action@v3
+      with:
+        context: variants/v1.5.3153.0-bf2all64-bf2stats-3.3.0
+        platforms: linux/386,linux/amd64
+        push: true
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2all64-bf2stats-3-3-0.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2all64-bf2stats-3-3-0.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2all64-bf2stats-3-3-0.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
     # This step generates the docker tags
     - name: Prepare
       id: prep-v1-5-3153-0-bf2hub
@@ -1083,6 +1217,73 @@ jobs:
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
+    # This step generates the docker tags
+    - name: Prepare
+      id: prep-v1-5-3153-0-bf2stats-2-6-0
+      run: |
+        set -e
+
+        # Get ref, i.e. <branch_name> from refs/heads/<branch_name>, or <tag-name> from refs/tags/<tag_name>. E.g. 'master' or 'v0.0.0'
+        REF=$( echo "${GITHUB_REF}" | rev | cut -d '/' -f 1 | rev )
+
+        # Get short commit hash E.g. 'abc0123'
+        SHA=$( echo "${GITHUB_SHA}" | cut -c1-7 )
+
+        # Generate docker image tags
+        # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
+        # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
+        VARIANT="v1.5.3153.0-bf2stats-2.6.0"
+        REF_VARIANT="${REF}-${VARIANT}"
+        REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
+
+        # Pass variables to next step
+        echo "VARIANT_BUILD_DIR=$VARIANT_BUILD_DIR" >> $GITHUB_OUTPUT
+        echo "VARIANT=$VARIANT" >> $GITHUB_OUTPUT
+        echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
+        echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
+
+    - name: v1.5.3153.0-bf2stats-2.6.0 - Build (PRs)
+      # Run only on pull requests
+      if: github.event_name == 'pull_request'
+      uses: docker/build-push-action@v3
+      with:
+        context: variants/v1.5.3153.0-bf2stats-2.6.0
+        platforms: linux/386,linux/amd64
+        push: false
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2stats-2-6-0.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2stats-2-6-0.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    - name: v1.5.3153.0-bf2stats-2.6.0 - Build and push (master)
+      # Run only on master
+      if: github.ref == 'refs/heads/master'
+      uses: docker/build-push-action@v3
+      with:
+        context: variants/v1.5.3153.0-bf2stats-2.6.0
+        platforms: linux/386,linux/amd64
+        push: true
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2stats-2-6-0.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2stats-2-6-0.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    - name: v1.5.3153.0-bf2stats-2.6.0 - Build and push (release)
+      if: startsWith(github.ref, 'refs/tags/')
+      uses: docker/build-push-action@v3
+      with:
+        context: variants/v1.5.3153.0-bf2stats-2.6.0
+        platforms: linux/386,linux/amd64
+        push: true
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2stats-2-6-0.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2stats-2-6-0.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2stats-2-6-0.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
     # This step generates the docker tags
     - name: Prepare
       id: prep-v1-5-3153-0-bf2stats-3-1-0
@@ -1284,6 +1485,73 @@ jobs:
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
+    # This step generates the docker tags
+    - name: Prepare
+      id: prep-v1-5-3153-0-bf2stats-3-3-0
+      run: |
+        set -e
+
+        # Get ref, i.e. <branch_name> from refs/heads/<branch_name>, or <tag-name> from refs/tags/<tag_name>. E.g. 'master' or 'v0.0.0'
+        REF=$( echo "${GITHUB_REF}" | rev | cut -d '/' -f 1 | rev )
+
+        # Get short commit hash E.g. 'abc0123'
+        SHA=$( echo "${GITHUB_SHA}" | cut -c1-7 )
+
+        # Generate docker image tags
+        # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
+        # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
+        VARIANT="v1.5.3153.0-bf2stats-3.3.0"
+        REF_VARIANT="${REF}-${VARIANT}"
+        REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
+
+        # Pass variables to next step
+        echo "VARIANT_BUILD_DIR=$VARIANT_BUILD_DIR" >> $GITHUB_OUTPUT
+        echo "VARIANT=$VARIANT" >> $GITHUB_OUTPUT
+        echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
+        echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
+
+    - name: v1.5.3153.0-bf2stats-3.3.0 - Build (PRs)
+      # Run only on pull requests
+      if: github.event_name == 'pull_request'
+      uses: docker/build-push-action@v3
+      with:
+        context: variants/v1.5.3153.0-bf2stats-3.3.0
+        platforms: linux/386,linux/amd64
+        push: false
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2stats-3-3-0.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2stats-3-3-0.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    - name: v1.5.3153.0-bf2stats-3.3.0 - Build and push (master)
+      # Run only on master
+      if: github.ref == 'refs/heads/master'
+      uses: docker/build-push-action@v3
+      with:
+        context: variants/v1.5.3153.0-bf2stats-3.3.0
+        platforms: linux/386,linux/amd64
+        push: true
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2stats-3-3-0.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2stats-3-3-0.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    - name: v1.5.3153.0-bf2stats-3.3.0 - Build and push (release)
+      if: startsWith(github.ref, 'refs/tags/')
+      uses: docker/build-push-action@v3
+      with:
+        context: variants/v1.5.3153.0-bf2stats-3.3.0
+        platforms: linux/386,linux/amd64
+        push: true
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2stats-3-3-0.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2stats-3-3-0.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-v1-5-3153-0-bf2stats-3-3-0.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
     # This step generates the docker tags
     - name: Prepare
       id: prep-v1-5-3153-0-fh2-4-6-304

diff --git a/README.md b/README.md
@@ -19,17 +19,21 @@ All images contain [`Battlefield 2 Server 1.50`](https://www.bf-games.net/downlo
 | `:v1.5.3153.0-bf2all64-bf2stats-2.3.8` | [View](variants/v1.5.3153.0-bf2all64-bf2stats-2.3.8 ) |
 | `:v1.5.3153.0-bf2all64-bf2stats-2.4.6` | [View](variants/v1.5.3153.0-bf2all64-bf2stats-2.4.6 ) |
 | `:v1.5.3153.0-bf2all64-bf2stats-2.5.1` | [View](variants/v1.5.3153.0-bf2all64-bf2stats-2.5.1 ) |
+| `:v1.5.3153.0-bf2all64-bf2stats-2.6.0` | [View](variants/v1.5.3153.0-bf2all64-bf2stats-2.6.0 ) |
 | `:v1.5.3153.0-bf2all64-bf2stats-3.1.0` | [View](variants/v1.5.3153.0-bf2all64-bf2stats-3.1.0 ) |
 | `:v1.5.3153.0-bf2all64-bf2stats-3.1.2` | [View](variants/v1.5.3153.0-bf2all64-bf2stats-3.1.2 ) |
 | `:v1.5.3153.0-bf2all64-bf2stats-3.2.0` | [View](variants/v1.5.3153.0-bf2all64-bf2stats-3.2.0 ) |
+| `:v1.5.3153.0-bf2all64-bf2stats-3.3.0` | [View](variants/v1.5.3153.0-bf2all64-bf2stats-3.3.0 ) |
 | `:v1.5.3153.0-bf2hub` | [View](variants/v1.5.3153.0-bf2hub ) |
 | `:v1.5.3153.0-bf2stats-2.2.0` | [View](variants/v1.5.3153.0-bf2stats-2.2.0 ) |
 | `:v1.5.3153.0-bf2stats-2.3.8` | [View](variants/v1.5.3153.0-bf2stats-2.3.8 ) |
 | `:v1.5.3153.0-bf2stats-2.4.6` | [View](variants/v1.5.3153.0-bf2stats-2.4.6 ) |
 | `:v1.5.3153.0-bf2stats-2.5.1` | [View](variants/v1.5.3153.0-bf2stats-2.5.1 ) |
+| `:v1.5.3153.0-bf2stats-2.6.0` | [View](variants/v1.5.3153.0-bf2stats-2.6.0 ) |
 | `:v1.5.3153.0-bf2stats-3.1.0` | [View](variants/v1.5.3153.0-bf2stats-3.1.0 ) |
 | `:v1.5.3153.0-bf2stats-3.1.2` | [View](variants/v1.5.3153.0-bf2stats-3.1.2 ) |
 | `:v1.5.3153.0-bf2stats-3.2.0` | [View](variants/v1.5.3153.0-bf2stats-3.2.0 ) |
+| `:v1.5.3153.0-bf2stats-3.3.0` | [View](variants/v1.5.3153.0-bf2stats-3.3.0 ) |
 | `:v1.5.3153.0-fh2-4.6.304` | [View](variants/v1.5.3153.0-fh2-4.6.304 ) |
 
 - `aix2` - [AIX-2.0](https://www.moddb.com/mods/allied-intent-xtended/downloads/aix-20-server-files) mod.