feat(github): testing out aqua workflows

buroa · Dec 20, 2023 · c9c419b · c9c419b
1 parent 5b14363
commit c9c419b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 24 deletions.
diff --git a/.github/workflows/flux-diff.yaml b/.github/workflows/flux-diff.yaml
@@ -7,7 +7,7 @@ on:
     paths: ["kubernetes/**.yaml"]
 
 env:
-  AQUA_CONFIG: ./.github/aqua.yaml
+  AQUA_GLOBAL_CONFIG: ./.github/aqua.yaml
 
 jobs:
   flux-diff:
@@ -33,18 +33,17 @@ jobs:
           token: "${{ steps.app-token.outputs.token }}"
 
       - name: Install System Tools
-        uses: awalsh128/cache-apt-pkgs-action@44c33b32f808cdddd5ac0366d70595ed63661ed8 # v1.3.1
-        with:
-          packages: curl git jo
-          version: 1.0
+        shell: bash
+        run: sudo apt-get -qq update && sudo apt-get -qq install --no-install-recommends -y curl git jo
 
       - name: Cache Aqua
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: cache
         with:
           path: ~/.local/share/aquaproj-aqua
           key: aqua-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('./.github/aqua.yaml') }}
-          restore-keys: aqua-${{ runner.os }}-${{ runner.arch }}-
+          restore-keys: |
+            aqua-${{ runner.os }}-${{ runner.arch }}-
 
       - name: Install Aqua and CLI Tools
         uses: aquaproj/aqua-installer@928a2ee4243a9ee8312d80dc8cbaca88fb602a91 # v2.2.0

diff --git a/.github/workflows/flux-hr-sync.yaml b/.github/workflows/flux-hr-sync.yaml
@@ -16,7 +16,7 @@ on:
     paths: ["kubernetes/**/helmrelease.yaml"]
 
 env:
-  AQUA_CONFIG: ./.github/aqua.yaml
+  AQUA_GLOBAL_CONFIG: ./.github/aqua.yaml
 
 jobs:
   sync:
@@ -37,18 +37,17 @@ jobs:
           fetch-depth: 0
 
       - name: Install System Tools
-        uses: awalsh128/cache-apt-pkgs-action@44c33b32f808cdddd5ac0366d70595ed63661ed8 # v1.3.1
-        with:
-          packages: curl git jo
-          version: 1.0
+        shell: bash
+        run: sudo apt-get -qq update && sudo apt-get -qq install --no-install-recommends -y curl git jo
 
       - name: Cache Aqua
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: cache
         with:
           path: ~/.local/share/aquaproj-aqua
           key: aqua-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('./.github/aqua.yaml') }}
-          restore-keys: aqua-${{ runner.os }}-${{ runner.arch }}-
+          restore-keys: |
+            aqua-${{ runner.os }}-${{ runner.arch }}-
 
       - name: Install Aqua and CLI Tools
         uses: aquaproj/aqua-installer@928a2ee4243a9ee8312d80dc8cbaca88fb602a91 # v2.2.0

diff --git a/.github/workflows/flux-hr-test-image.yaml b/.github/workflows/flux-hr-test-image.yaml
@@ -7,7 +7,7 @@ on:
     paths: ["kubernetes/**/helmrelease.yaml"]
 
 env:
-  AQUA_CONFIG: ./.github/aqua.yaml
+  AQUA_GLOBAL_CONFIG: ./.github/aqua.yaml
 
 jobs:
   changed-files:
@@ -67,18 +67,17 @@ jobs:
           fetch-depth: 0
 
       - name: Install System Tools
-        uses: awalsh128/cache-apt-pkgs-action@44c33b32f808cdddd5ac0366d70595ed63661ed8 # v1.3.1
-        with:
-          packages: curl git jo
-          version: 1.0
+        shell: bash
+        run: sudo apt-get -qq update && sudo apt-get -qq install --no-install-recommends -y curl git jo
 
       - name: Cache Aqua
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: cache
         with:
           path: ~/.local/share/aquaproj-aqua
           key: aqua-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('./.github/aqua.yaml') }}
-          restore-keys: aqua-${{ runner.os }}-${{ runner.arch }}-
+          restore-keys: |
+            aqua-${{ runner.os }}-${{ runner.arch }}-
 
       - name: Install Aqua and CLI Tools
         uses: aquaproj/aqua-installer@928a2ee4243a9ee8312d80dc8cbaca88fb602a91 # v2.2.0

diff --git a/.github/workflows/publish-terraform.yaml b/.github/workflows/publish-terraform.yaml
@@ -8,7 +8,7 @@ on:
     paths: ["terraform/**"]
 
 env:
-  AQUA_CONFIG: ./.github/aqua.yaml
+  AQUA_GLOBAL_CONFIG: ./.github/aqua.yaml
 
 jobs:
   publish-terraform:
@@ -31,18 +31,17 @@ jobs:
           token: "${{ steps.app-token.outputs.token }}"
 
       - name: Install System Tools
-        uses: awalsh128/cache-apt-pkgs-action@44c33b32f808cdddd5ac0366d70595ed63661ed8 # v1.3.1
-        with:
-          packages: curl git jo
-          version: 1.0
+        shell: bash
+        run: sudo apt-get -qq update && sudo apt-get -qq install --no-install-recommends -y curl git jo
 
       - name: Cache Aqua
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: cache
         with:
           path: ~/.local/share/aquaproj-aqua
           key: aqua-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('./.github/aqua.yaml') }}
-          restore-keys: aqua-${{ runner.os }}-${{ runner.arch }}-
+          restore-keys: |
+            aqua-${{ runner.os }}-${{ runner.arch }}-
 
       - name: Install Aqua and CLI Tools
         uses: aquaproj/aqua-installer@928a2ee4243a9ee8312d80dc8cbaca88fb602a91 # v2.2.0