ci: cleanup

pure-fish · Feb 16, 2024 · 0ebca80 · 0ebca80
1 parent 646b262
commit 0ebca80
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 37 deletions.
diff --git a/.github/workflows/add-version-tag.yml b/.github/workflows/add-version-tag.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: butlerlogic/[email protected]
         with:

diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal access token.

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,35 +23,39 @@ on:
       - ".github/**/*.yml"
 
 jobs:
-  # test-container:
-  #   name: Test on fish ${{ matrix.version.fish }} on Docker
-  #   runs-on: ubuntu-latest
-  #   strategy:
-  #     matrix:
-  #       version: [
-  #           # { fish: 3.3.1, alpine: 3.15 }, # for Ubuntu 22.04 LTS
-  #           # { fish: 3.6.3, alpine: 3.19 },
-  #           # { fish: 3.7.0, alpine: 'edge' },
-  #           # { fish: 3.6.2, alpine: 'edge' },
-  #         ]
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - run: make build-pure-on FISH_VERSION=${{ matrix.version.fish }}
-  #     - run: docker --version
-  #     - run: make test-pure-on FISH_VERSION=${{ matrix.version.fish }}
-
-  # test-nixos:
-  #   uses: ./.github/workflows/nixos.yml
-  #   secrets: inherit
+  test-container:
+    name: Test on fish ${{ matrix.version.fish }} on Docker
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        version: [
+            { fish: 3.3.1, alpine: 3.15 }, # for Ubuntu 22.04 LTS
+            { fish: 3.6.3, alpine: 3.19 },
+            { fish: 3.7.0, alpine: 'edge' },
+            # { fish: 9.9.9, alpine: 'edge' },
+          ]
+    steps:
+      - run: docker --version
+
+      - uses: actions/checkout@v4
+
+      - name: Build Pure Image on Alpine ${{ matrix.version.alpine }}
+        run: make build-pure-on FISH_VERSION=${{ matrix.version.fish }}
+
+      - name: Run Tests
+        run: make test-pure-on FISH_VERSION=${{ matrix.version.fish }}
+
+  test-nixos:
+    uses: ./.github/workflows/nixos.yml
+    secrets: inherit
 
   test-macos:
     if: true
     uses: ./.github/workflows/macos.yml
     secrets: inherit
 
-
-  # bump-version: # Bump when on master
-  #   needs: [test-container]
-  #   if: contains(github.ref, 'master')
-  #   uses: ./.github/workflows/bump-version.yml
-  #   secrets: inherit
+  bump-version: # Bump when on master
+    needs: [test-container]
+    if: contains(github.ref, 'master')
+    uses: ./.github/workflows/bump-version.yml
+    secrets: inherit
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -8,14 +8,16 @@ jobs:
     name: Test on fish on MacOS
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: show os
-        run: uname -s
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
       - name: Install Fish
         run: brew install fish
+
       - name: Install Fisher > Fishtape > Pure
         run: curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher jorgebucaran/fishtape ./
         shell: fish {0}
-      - name: Test Pure
+
+      - name: Run Tests
         run: fishtape tests/*.test.fish
         shell: fish {0}
diff --git a/.github/workflows/nixos.yml b/.github/workflows/nixos.yml
@@ -10,10 +10,14 @@ jobs:
     strategy:
       matrix:
         version: [
-            { fish: 3.7.0, alpine: 'edge' }, # https://search.nixos.org/packages?show=fish&type=packages&query=fish
+            { fish: 3.7.0 }, # https://search.nixos.org/packages?show=fish&type=packages&query=fish
           ]
     steps:
-      - uses: actions/checkout@v2
-      - run: make build-pure-on-nix FISH_VERSION=${{ matrix.version.fish }}
-      - run: docker --version
-      - run: make test-pure-on-nix FISH_VERSION=${{ matrix.version.fish }}
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Build Pure Image on NixOS
+        run: make build-pure-on-nix FISH_VERSION=${{ matrix.version.fish }}
+
+      - name: Run Tests
+        run: make test-pure-on-nix FISH_VERSION=${{ matrix.version.fish }}