feat: sepate tag/master builds

vrince · Apr 26, 2024 · 1fc72ef · 1fc72ef
1 parent afa1902
commit 1fc72ef
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/beats.yml b/.github/workflows/beats.yml
@@ -31,12 +31,15 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set tag
-        run: echo "git_tag=:${GITHUB_REF#refs/*/}" >> $GITHUB_STATE
+      - name: Build beat (tag)
+        id: build-beat
+        if: "startsWith(github.ref, 'refs/tags/')"
+        run: ./build.sh ${{ matrix.beat }} ${{ matrix.arch }}
 
-      - name: Build beat
+      - name: Build beat (master)
         id: build-beat
-        run: ./build.sh ${{ matrix.beat }} ${{ matrix.arch }} $git_tag
+        if: "!startsWith(github.ref, 'refs/tags/')"
+        run: ./build.sh ${{ matrix.beat }} ${{ matrix.arch }} master
 
       - uses: actions/upload-artifact@v2
         if: startsWith(github.ref, 'refs/tags/')

diff --git a/build.sh b/build.sh
@@ -3,11 +3,14 @@
 #set -e
 BEAT="${1:-filebeat}"
 ARCH="${2:-armv7l}"
-BRANCH="${3}"
+REF_NAME="${3}"
 
-TAG=$(git describe --tags --exact-match 2> /dev/null)
+if [[ -n ${GITHUB_REF_NAME} ]] ; then
+    BRANCH=${GITHUB_REF_NAME}
+    echo "Using GITHUB_REF_NAME(${BRANCH})"
+fi
 
-if [[ -z ${TAG} ]] ; then
+if [[ -z ${BRANCH} ]] ; then
     BRANCH="master"
     echo "Using default branch(${BRANCH})"
 fi