ci(actions): Catch docker build workflow up with configure changes

sile-typesetter · Sep 5, 2024 · 594cc21 · 594cc21
1 parent b66dcc3
commit 594cc21
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Install system dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install clang jq libarchive-tools mold luarocks
+          sudo apt-get install clang libarchive-tools mold luarocks
       - name: Setup ‘cargo’
         uses: actions-rs/toolchain@v1
       - name: Configure
@@ -32,11 +32,7 @@ jobs:
           ./configure \
             --enable-developer-mode \
             --disable-dependency-checks \
-            CHECKMAKE=false \
-            LUACHECK=false \
-            RUFF=false \
-            STYLUA=false \
-            TYPOS=cat
+            CHECKMAKE=false LUACHECK=false RUFF=false STYLUA=false TYPOS=cat
           echo "VERSION=$(./build-aux/git-version-gen .tarball-version)" >> $GITHUB_ENV
           echo "MAKEFLAGS=-j$(nproc) -Otarget" >> $GITHUB_ENV
       - name: Make

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+      - develop
+      - rel*
     tags:
       - latest
       - v*
@@ -19,20 +21,18 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Fetch tags
-        run: |
-          git fetch --prune --tags ||:
-      - name: Setup system dependencies
+      - name: Install system dependencies
         run: |
+          sudo apt-get update
           sudo apt-get install clang mold
       - name: Configure
         run: |
+          echo "REF=${GITHUB_REF##refs/*/}" >> $GITHUB_ENV
           ./bootstrap.sh
           ./configure \
-            --without-{bash,fish,zsh}-completion-dir \
             --enable-developer-mode \
             --disable-dependency-checks \
-            CURL=curl DOCKER=docker DIFF=diff TR=tr SORT=sort
+            CHECKMAKE=false LUACHECK=false RUFF=false STYLUA=false TYPOS=false
       - name: Publish Docker Image to GH Container Registry
         run: |
           make docker-build-push