GitHub Actions: revert changes and use if on each step (#5393)

i3 · Jan 23, 2023 · a5da4d5 · a5da4d5
1 parent 3702960
commit a5da4d5
Showing 1 changed file with 17 additions and 23 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,16 +19,23 @@ jobs:
       DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
       DOCKER_EMAIL: ${{ secrets.DOCKER_EMAIL }}
       DOCKER_USER: ${{ secrets.DOCKER_USER }}
+      GH_TOKEN: ${{ secrets.GH_TOKEN }}
+      BALTO_TOKEN: ${{ secrets.BALTO_TOKEN }}
 
     steps:
     - uses: actions/checkout@v3
     - run: git fetch --prune --unshallow
     - name: construct container name
       run: |
         echo "BASENAME=i3wm/travis-base:$(date +'%Y-%m')-$(./travis/ha.sh travis/travis-base.Dockerfile)" >> $GITHUB_ENV
+        echo "BASENAME_UBUNTU=i3wm/travis-base-ubuntu:$(date +'%Y-%m')-$(./travis/ha.sh travis/travis-base-ubuntu.Dockerfile)" >> $GITHUB_ENV
     - name: fetch or build Docker container
       run: |
         docker pull ${{ env.BASENAME }} || ./travis/docker-build-and-push.sh ${{ env.BASENAME }} travis/travis-base.Dockerfile
+    - name: fetch or build extra Docker containers
+      if: github.ref == 'refs/heads/next'
+      run: |
+        docker pull ${{ env.BASENAME_UBUNTU }} || ./travis/docker-build-and-push.sh ${{ env.BASENAME_UBUNTU }} travis/travis-base-ubuntu.Dockerfile
     - name: build i3
       run: |
         docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC ${{ env.BASENAME }} /bin/sh -c 'rm -rf build; mkdir -p build && cd build && CFLAGS="-Wformat -Wformat-security -Wextra -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Werror -fno-common -D_FORTIFY_SOURCE=3" meson setup .. -Ddocs=true -Dmans=true -Db_sanitize=address --buildtype=debugoptimized && ninja -v'
@@ -47,27 +54,8 @@ jobs:
     - name: build dist tarball
       run: |
         docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC ${{ env.BASENAME }} /bin/sh -c 'rm -rf distbuild; mkdir distbuild && cd distbuild && meson setup .. -Ddocs=true -Dmans=true && meson dist --no-tests'
-  deploy:
-    name: Push artifacts
-    runs-on: ubuntu-latest
-    needs: [build]
-    env:
-      DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
-      DOCKER_EMAIL: ${{ secrets.DOCKER_EMAIL }}
-      DOCKER_USER: ${{ secrets.DOCKER_USER }}
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
-      BALTO_TOKEN: ${{ secrets.BALTO_TOKEN }}
-    if: github.ref == 'refs/heads/next'
-    steps:
-    - uses: actions/checkout@v3
-    - name: construct container name
-      run: |
-        echo "BASENAME=i3wm/travis-base:$(date +'%Y-%m')-$(./travis/ha.sh travis/travis-base.Dockerfile)" >> $GITHUB_ENV
-        echo "BASENAME_UBUNTU=i3wm/travis-base-ubuntu:$(date +'%Y-%m')-$(./travis/ha.sh travis/travis-base-ubuntu.Dockerfile)" >> $GITHUB_ENV
-    - name: fetch or build extra Docker containers
-      run: |
-        docker pull ${{ env.BASENAME_UBUNTU }} || ./travis/docker-build-and-push.sh ${{ env.BASENAME_UBUNTU }} travis/travis-base-ubuntu.Dockerfile
     - name: build Debian packages
+      if: github.ref == 'refs/heads/next'
       run: |
         echo "::group::Debian amd64"
         docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${{ env.BASENAME }} ./travis/debian-build.sh deb/debian-amd64/DIST
@@ -76,11 +64,17 @@ jobs:
         docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${{ env.BASENAME_UBUNTU }} ./travis/debian-build.sh deb/ubuntu-amd64/DIST
         echo "::endgroup::"
     - name: push Debian packages to balto
-      run: travis/push-balto.sh
+      if: github.ref == 'refs/heads/next'
+      run: |
+        travis/push-balto.sh
     - name: build docs
-      run: docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${{ env.BASENAME }} ./travis/docs.sh
+      if: github.ref == 'refs/heads/next'
+      run: |
+        docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${{ env.BASENAME }} ./travis/docs.sh
     - name: push docs to GitHub pages
-      run: travis/deploy-github-pages.sh
+      if: github.ref == 'refs/heads/next'
+      run: |
+        travis/deploy-github-pages.sh
   formatting:
     name: Check formatting
     runs-on: ubuntu-latest