workflows: support building from branch (#4499)

* workflows: support building from branch Signed-off-by: Patrick Stephens <[email protected]> * workflows: temporarily invoke on branch Signed-off-by: Patrick Stephens <[email protected]> * workflows: resolve missing comma in staging build Signed-off-by: Patrick Stephens <[email protected]> * workflows: resolve incorrect directory Signed-off-by: Patrick Stephens <[email protected]> * workflows: resolve incorrect directory Signed-off-by: Patrick Stephens <[email protected]> * workflows: revert to correct master branch Signed-off-by: Patrick Stephens <[email protected]>
fluent · Dec 21, 2021 · b3857f4 · b3857f4
1 parent 15ed858
commit b3857f4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/build-master-packages.yaml b/.github/workflows/build-master-packages.yaml
@@ -28,6 +28,7 @@ jobs:
     uses: fluent/fluent-bit/.github/workflows/call-build-packages.yaml@master
     with:
       version: master
+      branch: master
       build_matrix: ${{ needs.master-build-generate-matrix.outputs.build-matrix }}
     secrets:
       token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/call-build-packages.yaml b/.github/workflows/call-build-packages.yaml
@@ -16,6 +16,10 @@ on:
         description: The Github environment to run this workflow on.
         type: string
         required: false
+      branch:
+        description: The optional source code branch to use for building against.
+        type: string
+        required: false
     secrets:
       token:
         description: The Github token or similar to authenticate with.
@@ -61,16 +65,19 @@ jobs:
 
       - name: Build the ${{ matrix.distro }} artifacts
         run: |
-          ./build.sh -v "${{ inputs.version }}" -d "${{ matrix.distro }}"
+          ./build.sh
         env:
+          FLB_VERSION: ${{ inputs.version }}
+          FLB_DISTRO: ${{ matrix.distro }}
           FLB_OUT_DIR: staging
+          FLB_BRANCH: ${{ inputs.branch }}
         working-directory: packaging
 
       - name: Upload the ${{ matrix.distro }} artifacts
         uses: actions/upload-artifact@v2
         with:
           name: packages-${{ inputs.version }}-${{ steps.formatted_distro.outputs.replaced }}
-          path: packaging/packages/staging/
+          path: packaging/packages/
           if-no-files-found: error
 
       - name: Retrieve target info for repo creation
@@ -90,6 +97,7 @@ jobs:
                   exit 1
               fi
           fi
+          echo "$TARGET"
           echo ::set-output name=echo ::set-output name=target::$TARGET
         env:
           DISTRO: ${{ matrix.distro }}

diff --git a/.github/workflows/staging-build.yaml b/.github/workflows/staging-build.yaml
@@ -81,7 +81,7 @@ jobs:
             echo '"amazonlinux/2", "amazonlinux/2.arm64v8",'
             echo '"centos/7", "centos/7.arm64v8", "centos/8", "centos/8.arm64v8",'
             echo '"debian/stretch", "debian/stretch.arm64v8", "debian/buster", "debian/buster.arm64v8", "debian/bullseye", "debian/bullseye.arm64v8",'
-            echo '"ubuntu/16.04", "ubuntu/18.04", "ubuntu/20.04", "ubuntu/18.04.arm64v8", "ubuntu/20.04.arm64v8"'
+            echo '"ubuntu/16.04", "ubuntu/18.04", "ubuntu/20.04", "ubuntu/18.04.arm64v8", "ubuntu/20.04.arm64v8",'
             echo '"raspbian/buster", "raspbian/bullseye"'
             echo ']}'
           ) | jq -c .)