Skip to content

Commit 3dcaf9a

Browse files
author
Matt Reeves
committedJul 24, 2024
Merge branch 'main' into renovate/ghcr.io-linuxserver-bazarr
2 parents 1e3a2db + 0d60994 commit 3dcaf9a

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed
 

‎.forgejo/workflows/CD.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
if [ "$(git rev-parse --is-shallow-repository)" = "true" ]; then
2121
git fetch --unshallow
2222
fi
23-
folders=$(git diff --name-only HEAD~1 HEAD | cut -d/ -f1 | sort | uniq)
23+
folders=$(git diff --name-only HEAD~1 HEAD | grep '^iac/docker/' | cut -d/ -f3 | sort | uniq)
2424
echo "Modified folders: $folders"
2525
echo "::set-output name=folders::$folders"
2626
@@ -83,8 +83,8 @@ jobs:
8383
-d "{\"extra_vars\": {\"target_host\": \"$target_host\", \"folder\": \"$folder\"}}" \
8484
"https://awx.mafyuh.xyz/api/v2/job_templates/13/launch/"
8585
86-
sleep 45 # Delay for 45 seconds before fetching logs
87-
86+
sleep 45
87+
8888
job_id=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/job_templates/13/jobs/?order_by=-id | jq -r '.results[0].id')
8989
logs=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/jobs/$job_id/stdout/?format=json)
9090
echo "AWX Job Logs for folder: $folder"

‎.forgejo/workflows/yamllint.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,10 @@ jobs:
1717
with:
1818
node-version: 14
1919

20-
- name: Install yamllint
21-
run: |
22-
npm install -g yaml-lint
23-
2420
- name: Show yamllint version
2521
run: |
2622
yamllint --version
2723
2824
- name: Lint .yml files
2925
run: |
30-
yamllint -d "{extends: relaxed, rules: {line-length: {max: 120}}}" ./**/*.yml
26+
yamllint -d "{extends: relaxed, rules: {line-length: {max: 120}}}" docker/**/*.yml

0 commit comments

Comments
 (0)
Please sign in to comment.