feat: use hyphen for consistency
All checks were successful
renovate / renovate (push) Successful in 1m27s
All checks were successful
renovate / renovate (push) Successful in 1m27s
This commit is contained in:
@@ -104,14 +104,14 @@ jobs:
|
|||||||
echo ""
|
echo ""
|
||||||
echo "----"
|
echo "----"
|
||||||
|
|
||||||
echo "is_automerge=${IS_AUTOMERGE}" >> "$GITHUB_OUTPUT"
|
echo "is-automerge=${IS_AUTOMERGE}" >> "$GITHUB_OUTPUT"
|
||||||
echo "render_all=${RENDER_ALL}" >> "$GITHUB_OUTPUT"
|
echo "render-all=${RENDER_ALL}" >> "$GITHUB_OUTPUT"
|
||||||
echo "diff_target=${DIFF_TARGET}" >> "$GITHUB_OUTPUT"
|
echo "diff-target=${DIFF_TARGET}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
- name: Prepare Manifest Branch
|
- name: Prepare Manifest Branch
|
||||||
id: prepare-manifest-branch
|
id: prepare-manifest-branch
|
||||||
env:
|
env:
|
||||||
IS_AUTOMERGE: ${{ steps.mode.outputs.is_automerge }}
|
IS_AUTOMERGE: ${{ steps.mode.outputs.is-automerge }}
|
||||||
run: |
|
run: |
|
||||||
cd "${MANIFEST_DIR}"
|
cd "${MANIFEST_DIR}"
|
||||||
|
|
||||||
@@ -148,13 +148,13 @@ jobs:
|
|||||||
echo ""
|
echo ""
|
||||||
echo "----"
|
echo "----"
|
||||||
|
|
||||||
echo "BRANCH_NAME=${BRANCH_NAME}" >> "$GITHUB_OUTPUT"
|
echo "branch-name=${BRANCH_NAME}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
- name: Check Which Directories Have Changes
|
- name: Check Which Directories Have Changes
|
||||||
id: check-dir-changes
|
id: check-dir-changes
|
||||||
env:
|
env:
|
||||||
RENDER_ALL: ${{ steps.mode.outputs.render_all }}
|
RENDER_ALL: ${{ steps.mode.outputs.render-all }}
|
||||||
DIFF_TARGET: ${{ steps.mode.outputs.diff_target }}
|
DIFF_TARGET: ${{ steps.mode.outputs.diff-target }}
|
||||||
run: |
|
run: |
|
||||||
cd "${MAIN_DIR}"
|
cd "${MAIN_DIR}"
|
||||||
|
|
||||||
@@ -178,7 +178,6 @@ jobs:
|
|||||||
echo "----"
|
echo "----"
|
||||||
|
|
||||||
echo "changes-detected=true" >> "$GITHUB_OUTPUT"
|
echo "changes-detected=true" >> "$GITHUB_OUTPUT"
|
||||||
echo "render-dir-csv=$(echo "${RENDER_DIR}" | paste -sd ',' -)" >> "$GITHUB_OUTPUT"
|
|
||||||
echo "render-dir<<EOF" >> "$GITHUB_OUTPUT"
|
echo "render-dir<<EOF" >> "$GITHUB_OUTPUT"
|
||||||
echo "${RENDER_DIR}" >> "$GITHUB_OUTPUT"
|
echo "${RENDER_DIR}" >> "$GITHUB_OUTPUT"
|
||||||
echo "EOF" >> "$GITHUB_OUTPUT"
|
echo "EOF" >> "$GITHUB_OUTPUT"
|
||||||
@@ -342,10 +341,13 @@ jobs:
|
|||||||
echo ">> Changes detected"
|
echo ">> Changes detected"
|
||||||
git status --porcelain
|
git status --porcelain
|
||||||
|
|
||||||
|
CHANGED_CHARTS=$(echo "$GIT_CHANGES" | grep -oE "clusters/${CLUSTER}/manifests/[^/]+" | awk -F '/' '{print $4}' | sort -u | paste -sd ',' -)
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "----"
|
echo "----"
|
||||||
|
|
||||||
echo "changes-detected=true" >> "$GITHUB_OUTPUT"
|
echo "changes-detected=true" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "changed-charts-csv=${CHANGED_CHARTS}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
else
|
else
|
||||||
echo ">> No changes detected, skipping PR creation"
|
echo ">> No changes detected, skipping PR creation"
|
||||||
@@ -359,8 +361,8 @@ jobs:
|
|||||||
id: commit-push
|
id: commit-push
|
||||||
if: steps.check-changes.outputs.changes-detected == 'true'
|
if: steps.check-changes.outputs.changes-detected == 'true'
|
||||||
env:
|
env:
|
||||||
BRANCH_NAME: ${{ steps.prepare-manifest-branch.outputs.BRANCH_NAME }}
|
BRANCH_NAME: ${{ steps.prepare-manifest-branch.outputs.branch-name }}
|
||||||
IS_AUTOMERGE: ${{ steps.mode.outputs.is_automerge }}
|
IS_AUTOMERGE: ${{ steps.mode.outputs.is-automerge }}
|
||||||
run: |
|
run: |
|
||||||
cd "${MANIFEST_DIR}"
|
cd "${MANIFEST_DIR}"
|
||||||
|
|
||||||
@@ -386,15 +388,15 @@ jobs:
|
|||||||
echo "----"
|
echo "----"
|
||||||
|
|
||||||
echo "push=true" >> "$GITHUB_OUTPUT"
|
echo "push=true" >> "$GITHUB_OUTPUT"
|
||||||
echo "HEAD_BRANCH=${BRANCH_NAME}" >> "$GITHUB_OUTPUT"
|
echo "head-branch=${BRANCH_NAME}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
- name: Check for Pull Request
|
- name: Check for Pull Request
|
||||||
id: check-for-pull-request
|
id: check-for-pull-request
|
||||||
if: steps.commit-push.outputs.push == 'true' && steps.mode.outputs.is_automerge == 'false'
|
if: steps.commit-push.outputs.push == 'true' && steps.mode.outputs.is-automerge == 'false'
|
||||||
env:
|
env:
|
||||||
GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
|
GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
|
||||||
GITEA_URL: ${{ secrets.REPO_URL }}
|
GITEA_URL: ${{ secrets.REPO_URL }}
|
||||||
HEAD_BRANCH: ${{ steps.commit-push.outputs.HEAD_BRANCH }}
|
HEAD_BRANCH: ${{ steps.commit-push.outputs.head-branch }}
|
||||||
run: |
|
run: |
|
||||||
cd "${MANIFEST_DIR}"
|
cd "${MANIFEST_DIR}"
|
||||||
|
|
||||||
@@ -429,13 +431,13 @@ jobs:
|
|||||||
|
|
||||||
- name: Create Pull Request
|
- name: Create Pull Request
|
||||||
id: create-pull-request
|
id: create-pull-request
|
||||||
if: steps.commit-push.outputs.push == 'true' && (steps.mode.outputs.is_automerge == 'true' || steps.check-for-pull-request.outputs.pull-request-exists == 'false')
|
if: steps.commit-push.outputs.push == 'true' && (steps.mode.outputs.is-automerge == 'true' || steps.check-for-pull-request.outputs.pull-request-exists == 'false')
|
||||||
env:
|
env:
|
||||||
IS_AUTOMERGE: ${{ steps.mode.outputs.is_automerge }}
|
IS_AUTOMERGE: ${{ steps.mode.outputs.is-automerge }}
|
||||||
GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
|
GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
|
||||||
GITEA_URL: ${{ secrets.REPO_URL }}
|
GITEA_URL: ${{ secrets.REPO_URL }}
|
||||||
HEAD_BRANCH: ${{ steps.commit-push.outputs.HEAD_BRANCH }}
|
HEAD_BRANCH: ${{ steps.commit-push.outputs.head-branch }}
|
||||||
CHARTS: ${{ steps.check-dir-changes.outputs.render-dir-csv }}
|
CHARTS: ${{ steps.check-changes.outputs.changed-charts-csv }}
|
||||||
EVENT_NAME: ${{ github.event_name }}
|
EVENT_NAME: ${{ github.event_name }}
|
||||||
ACTOR: ${{ github.actor }}
|
ACTOR: ${{ github.actor }}
|
||||||
SHA: ${{ github.sha }}
|
SHA: ${{ github.sha }}
|
||||||
@@ -491,12 +493,12 @@ jobs:
|
|||||||
|
|
||||||
- name: Update Pull Request
|
- name: Update Pull Request
|
||||||
id: update-pull-request
|
id: update-pull-request
|
||||||
if: steps.commit-push.outputs.push == 'true' && steps.check-for-pull-request.outputs.pull-request-exists != 'false' && steps.mode.outputs.is_automerge == 'false'
|
if: steps.commit-push.outputs.push == 'true' && steps.check-for-pull-request.outputs.pull-request-exists != 'false' && steps.mode.outputs.is-automerge == 'false'
|
||||||
env:
|
env:
|
||||||
GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
|
GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
|
||||||
GITEA_URL: ${{ secrets.REPO_URL }}
|
GITEA_URL: ${{ secrets.REPO_URL }}
|
||||||
PR_NUMBER: ${{ steps.check-for-pull-request.outputs.pull-request-exists }}
|
PR_NUMBER: ${{ steps.check-for-pull-request.outputs.pull-request-exists }}
|
||||||
CHARTS: ${{ steps.check-dir-changes.outputs.render-dir-csv }}
|
CHARTS: ${{ steps.check-changes.outputs.changed-charts-csv }}
|
||||||
EVENT_NAME: ${{ github.event_name }}
|
EVENT_NAME: ${{ github.event_name }}
|
||||||
ACTOR: ${{ github.actor }}
|
ACTOR: ${{ github.actor }}
|
||||||
SHA: ${{ github.sha }}
|
SHA: ${{ github.sha }}
|
||||||
@@ -534,7 +536,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Merge Changes
|
- name: Merge Changes
|
||||||
id: merge-changes
|
id: merge-changes
|
||||||
if: steps.commit-push.outputs.push == 'true' && steps.mode.outputs.is_automerge == 'true'
|
if: steps.commit-push.outputs.push == 'true' && steps.mode.outputs.is-automerge == 'true'
|
||||||
env:
|
env:
|
||||||
GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
|
GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
|
||||||
GITEA_URL: ${{ secrets.REPO_URL }}
|
GITEA_URL: ${{ secrets.REPO_URL }}
|
||||||
@@ -565,9 +567,9 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Cleanup Branch
|
- name: Cleanup Branch
|
||||||
if: failure() && steps.mode.outputs.is_automerge == 'true'
|
if: failure() && steps.mode.outputs.is-automerge == 'true'
|
||||||
env:
|
env:
|
||||||
BRANCH_NAME: ${{ steps.prepare-manifest-branch.outputs.BRANCH_NAME }}
|
BRANCH_NAME: ${{ steps.prepare-manifest-branch.outputs.branch-name }}
|
||||||
run: |
|
run: |
|
||||||
cd "${MANIFEST_DIR}"
|
cd "${MANIFEST_DIR}"
|
||||||
|
|
||||||
@@ -579,7 +581,7 @@ jobs:
|
|||||||
|
|
||||||
- name: ntfy Created
|
- name: ntfy Created
|
||||||
uses: niniyas/ntfy-action@master
|
uses: niniyas/ntfy-action@master
|
||||||
if: steps.create-pull-request.outputs.pull-request-operation == 'created' && steps.mode.outputs.is_automerge == 'false'
|
if: steps.create-pull-request.outputs.pull-request-operation == 'created' && steps.mode.outputs.is-automerge == 'false'
|
||||||
with:
|
with:
|
||||||
url: "${{ secrets.NTFY_URL }}"
|
url: "${{ secrets.NTFY_URL }}"
|
||||||
topic: "${{ secrets.NTFY_TOPIC }}"
|
topic: "${{ secrets.NTFY_TOPIC }}"
|
||||||
@@ -587,13 +589,13 @@ jobs:
|
|||||||
priority: 3
|
priority: 3
|
||||||
headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
|
headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
|
||||||
tags: action,successfully,completed
|
tags: action,successfully,completed
|
||||||
details: "Created renderd manifests for cluster '${CLUSTER}' with charts: ${{ steps.check-dir-changes.outputs.render-dir-csv }}"
|
details: "Created renderd manifests for cluster '${CLUSTER}' with charts: ${{ steps.check-changes.outputs.changed-charts-csv }}"
|
||||||
icon: "https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png"
|
icon: "https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png"
|
||||||
actions: '[{"action": "view", "label": "Open Gitea", "url": "${{ steps.create-pull-request.outputs.pull-request-url }}", "clear": true}]'
|
actions: '[{"action": "view", "label": "Open Gitea", "url": "${{ steps.create-pull-request.outputs.pull-request-url }}", "clear": true}]'
|
||||||
|
|
||||||
- name: ntfy Updated
|
- name: ntfy Updated
|
||||||
uses: niniyas/ntfy-action@master
|
uses: niniyas/ntfy-action@master
|
||||||
if: steps.commit-push.outputs.push == 'true' && steps.check-for-pull-request.outputs.pull-request-exists != 'false' && steps.mode.outputs.is_automerge == 'false'
|
if: steps.commit-push.outputs.push == 'true' && steps.check-for-pull-request.outputs.pull-request-exists != 'false' && steps.mode.outputs.is-automerge == 'false'
|
||||||
with:
|
with:
|
||||||
url: "${{ secrets.NTFY_URL }}"
|
url: "${{ secrets.NTFY_URL }}"
|
||||||
topic: "${{ secrets.NTFY_TOPIC }}"
|
topic: "${{ secrets.NTFY_TOPIC }}"
|
||||||
@@ -601,7 +603,7 @@ jobs:
|
|||||||
priority: 3
|
priority: 3
|
||||||
headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
|
headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
|
||||||
tags: action,successfully,completed
|
tags: action,successfully,completed
|
||||||
details: "Updated rendered manifests PR for cluster '${CLUSTER}' with charts: ${{ steps.check-dir-changes.outputs.render-dir-csv }}"
|
details: "Updated rendered manifests PR for cluster '${CLUSTER}' with charts: ${{ steps.check-changes.outputs.changed-charts-csv }}"
|
||||||
icon: "https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png"
|
icon: "https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png"
|
||||||
actions: '[{"action": "view", "label": "Open Gitea", "url": "${{ steps.check-for-pull-request.outputs.pull-request-url }}", "clear": true}]'
|
actions: '[{"action": "view", "label": "Open Gitea", "url": "${{ steps.check-for-pull-request.outputs.pull-request-url }}", "clear": true}]'
|
||||||
|
|
||||||
@@ -615,7 +617,7 @@ jobs:
|
|||||||
priority: 3
|
priority: 3
|
||||||
headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
|
headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
|
||||||
tags: action,successfully,completed
|
tags: action,successfully,completed
|
||||||
details: "Automerged manifest rendering for cluster '${CLUSTER}' with charts: ${{ steps.check-dir-changes.outputs.render-dir-csv }}"
|
details: "Automerged manifest rendering for cluster '${CLUSTER}' with charts: ${{ steps.check-changes.outputs.changed-charts-csv }}"
|
||||||
icon: "https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png"
|
icon: "https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png"
|
||||||
actions: '[{"action": "view", "label": "Open Gitea", "url": "${{ steps.create-pull-request.outputs.pull-request-url }}", "clear": true}]'
|
actions: '[{"action": "view", "label": "Open Gitea", "url": "${{ steps.create-pull-request.outputs.pull-request-url }}", "clear": true}]'
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user