Skip to content

Commit 6df9899

Browse files
committed
feat(github): testing out aqua workflows
1 parent 5b14363 commit 6df9899

9 files changed

+20
-31
lines changed

.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ indent_size = 4
1515

1616
[*.{bash,sh}]
1717
indent_style = space
18-
indent_size = 4
18+
indent_size = 4

.envrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#shellcheck disable=SC2148,SC2155
22
export KUBECTL_EXTERNAL_DIFF="dyff between --omit-header --set-exit-code"
3-
export SOPS_AGE_KEY_FILE=$(expand_path ~/.config/sops/age/keys.txt)
3+
export SOPS_AGE_KEY_FILE=$(expand_path ~/.config/sops/age/keys.txt)

.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
*.yaml linguist-detectable=true
44
*.yaml linguist-language=YAML
55
*.sops.* diff=sopsdiffer
6-
*.sops.toml linguist-language=JSON
6+
*.sops.toml linguist-language=JSON

.github/workflows/flux-diff.yaml

+3-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
paths: ["kubernetes/**.yaml"]
88

99
env:
10-
AQUA_CONFIG: ./.github/aqua.yaml
10+
AQUA_GLOBAL_CONFIG: ./.github/aqua.yaml
1111

1212
jobs:
1313
flux-diff:
@@ -33,14 +33,11 @@ jobs:
3333
token: "${{ steps.app-token.outputs.token }}"
3434

3535
- name: Install System Tools
36-
uses: awalsh128/cache-apt-pkgs-action@44c33b32f808cdddd5ac0366d70595ed63661ed8 # v1.3.1
37-
with:
38-
packages: curl git jo
39-
version: 1.0
36+
shell: bash
37+
run: sudo apt-get -qq update && sudo apt-get -qq install --no-install-recommends -y curl git jo
4038

4139
- name: Cache Aqua
4240
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
43-
id: cache
4441
with:
4542
path: ~/.local/share/aquaproj-aqua
4643
key: aqua-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('./.github/aqua.yaml') }}

.github/workflows/flux-hr-test-image.yaml .github/workflows/flux-hr-image-test.yaml

+6-8
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ on:
77
paths: ["kubernetes/**/helmrelease.yaml"]
88

99
env:
10-
AQUA_CONFIG: ./.github/aqua.yaml
10+
AQUA_GLOBAL_CONFIG: ./.github/aqua.yaml
11+
KUBERNETES_DIR: ./kubernetes
1112

1213
jobs:
1314
changed-files:
@@ -67,14 +68,11 @@ jobs:
6768
fetch-depth: 0
6869

6970
- name: Install System Tools
70-
uses: awalsh128/cache-apt-pkgs-action@44c33b32f808cdddd5ac0366d70595ed63661ed8 # v1.3.1
71-
with:
72-
packages: curl git jo
73-
version: 1.0
71+
shell: bash
72+
run: sudo apt-get -qq update && sudo apt-get -qq install --no-install-recommends -y curl git jo
7473

7574
- name: Cache Aqua
7675
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
77-
id: cache
7876
with:
7977
path: ~/.local/share/aquaproj-aqua
8078
key: aqua-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('./.github/aqua.yaml') }}
@@ -92,8 +90,8 @@ jobs:
9290
id: extract-images
9391
run: |
9492
images=$(
95-
npx zx ./.github/scripts/extract-images.mjs \
96-
--kubernetes-dir "./kubernetes" \
93+
npx zx ./.github/workflows/scripts/extract-images.mjs \
94+
--kubernetes-dir "${{ env.KUBERNETES_DIR }}" \
9795
--helmrelease "${{ matrix.files }}"
9896
)
9997
echo "images=${images}" >> $GITHUB_OUTPUT

.github/workflows/flux-hr-sync.yaml

+3-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
paths: ["kubernetes/**/helmrelease.yaml"]
1717

1818
env:
19-
AQUA_CONFIG: ./.github/aqua.yaml
19+
AQUA_GLOBAL_CONFIG: ./.github/aqua.yaml
2020

2121
jobs:
2222
sync:
@@ -37,14 +37,11 @@ jobs:
3737
fetch-depth: 0
3838

3939
- name: Install System Tools
40-
uses: awalsh128/cache-apt-pkgs-action@44c33b32f808cdddd5ac0366d70595ed63661ed8 # v1.3.1
41-
with:
42-
packages: curl git jo
43-
version: 1.0
40+
shell: bash
41+
run: sudo apt-get -qq update && sudo apt-get -qq install --no-install-recommends -y curl git jo
4442

4543
- name: Cache Aqua
4644
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
47-
id: cache
4845
with:
4946
path: ~/.local/share/aquaproj-aqua
5047
key: aqua-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('./.github/aqua.yaml') }}

.github/workflows/publish-terraform.yaml

+3-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
paths: ["terraform/**"]
99

1010
env:
11-
AQUA_CONFIG: ./.github/aqua.yaml
11+
AQUA_GLOBAL_CONFIG: ./.github/aqua.yaml
1212

1313
jobs:
1414
publish-terraform:
@@ -31,14 +31,11 @@ jobs:
3131
token: "${{ steps.app-token.outputs.token }}"
3232

3333
- name: Install System Tools
34-
uses: awalsh128/cache-apt-pkgs-action@44c33b32f808cdddd5ac0366d70595ed63661ed8 # v1.3.1
35-
with:
36-
packages: curl git jo
37-
version: 1.0
34+
shell: bash
35+
run: sudo apt-get -qq update && sudo apt-get -qq install --no-install-recommends -y curl git jo
3836

3937
- name: Cache Aqua
4038
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
41-
id: cache
4239
with:
4340
path: ~/.local/share/aquaproj-aqua
4441
key: aqua-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('./.github/aqua.yaml') }}

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ xanmanning.k3s*
1818
kubeconfig*
1919
kubernetes/schemas
2020
# extras
21-
config.xml
21+
config.xml

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
1111
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
1212

13-
0. You just DO WHAT THE FUCK YOU WANT TO.
13+
0. You just DO WHAT THE FUCK YOU WANT TO.

0 commit comments

Comments
 (0)