Skip to content

Commit 1a8cb88

Browse files
chmeliikchmeliik
committed
Update shared CI
Done with: uvx cruft update --skip-apply-ask --allow-untracked-files And manually resolved rejections in files that we edited separately from upstream. Signed-off-by: Adam Cmiel <acmiel@redhat.com>
1 parent 85c42a8 commit 1a8cb88

12 files changed

Lines changed: 36 additions & 44 deletions

‎.cruft.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "https://github.com/konflux-ci/task-repo-shared-ci",
3-
"commit": "d28b70d16778679d7768da3ec5c992c7693ec98a",
3+
"commit": "e3e90232ccd9e98c922ec2285ca89f53909aa73d",
44
"skip": [
55
"hack/build-manifests.sh",
66
".github/scripts/check_tekton_tasks.sh"
@@ -13,7 +13,7 @@
1313
"*"
1414
],
1515
"_template": "https://github.com/konflux-ci/task-repo-shared-ci",
16-
"_commit": "d28b70d16778679d7768da3ec5c992c7693ec98a"
16+
"_commit": "e3e90232ccd9e98c922ec2285ca89f53909aa73d"
1717
}
1818
},
1919
"directory": null

‎.github/scripts/test_tekton_tasks.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,14 @@ shopt -s nullglob
3131

3232
WORKSPACE_TEMPLATE=${BASH_SOURCE%/*/*}/resources/workspace-template.yaml
3333

34-
if [[ $# -eq 0 || ${1} == "-h" ]]; then
34+
if [ $# -gt 0 ]; then
35+
TEST_ITEMS=("$@")
36+
else
37+
# shellcheck disable=SC2128 # TEST_ITEMS is a plain string from env, not yet an array
38+
read -r -a TEST_ITEMS <<< "${TEST_ITEMS:-}"
39+
fi
40+
41+
if [[ ${1:-} == "-h" ]] || [[ ${#TEST_ITEMS[@]} -eq 0 ]]; then
3542
cat <<EOF
3643
Error: No task directories.
3744
@@ -52,13 +59,6 @@ EOF
5259
exit 1
5360
fi
5461

55-
if [ $# -gt 0 ]; then
56-
TEST_ITEMS=("$@")
57-
else
58-
# shellcheck disable=SC2128 # TEST_ITEMS is a plain string from env, not yet an array
59-
read -r -a TEST_ITEMS <<< "$TEST_ITEMS"
60-
fi
61-
6262
# Check that all directories or test yamls exist. If not, fail
6363
for ITEM in "${TEST_ITEMS[@]}"; do
6464
if [[ "$ITEM" == *tests/test-*.yaml && -f "$ITEM" ]]; then

‎.github/workflows/check-kustomize-build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Check out code
20-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
20+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2121
- name: Install oc
2222
run: |
2323
set -euo pipefail

‎.github/workflows/check-ta.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Check out code
20-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
20+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2121

2222
- name: Check Trusted Artifact variants
2323
id: check
@@ -31,7 +31,7 @@ jobs:
3131
3232
- name: Attach patch
3333
if: ${{ steps.check.conclusion == 'failure' }}
34-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
34+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
3535
with:
3636
name: Trusted artifacts patch
3737
path: ./ta.patch

‎.github/workflows/check-task-migration.yaml‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,16 @@ jobs:
1616
runs-on: ubuntu-24.04
1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
19+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2020
with:
2121
fetch-depth: 0
2222
- name: Create k8s Kind Cluster
23-
uses: helm/kind-action@92086f6be054225fa813e0a4b13787fc9088faab # v1.13.0
23+
uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc # v1.14.0
2424
with:
2525
cluster_name: kind
26-
- uses: tektoncd/actions/setup-tektoncd@main
27-
id: setup-tektoncd
26+
- uses: tektoncd/actions/setup-tektoncd@2b126ef971bbfda195d8a6c9b7c4eb3bfda452bf # main
2827
with:
29-
pipeline_version: latest
30-
continue-on-error: true
31-
- name: Describe setup-tektoncd failure
32-
if: steps.setup-tektoncd.outcome != 'success'
33-
run: |
34-
curl -s https://api.github.com/repos/tektoncd/pipeline/releases/latest | jq
35-
echo "The previous action setup-tektoncd seems to have failed due to a known issue caused by hitting the rate-limit"
36-
echo "For more information, follow the following issue: https://github.com/tektoncd/actions/issues/9"
37-
echo "The only known workaround at the moment is to re-run this workflow."
38-
exit 1
28+
pipeline_version: v1.14.0
3929
- name: Run check
4030
run: |
4131
DEBIAN_FRONTEND=noninteractive \

‎.github/workflows/checkton.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Checkout repository
20-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
20+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2121
with:
2222
# Differential Checkton requires full git history
2323
fetch-depth: 0

‎.github/workflows/run-task-tests.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ jobs:
2121
runs-on: ubuntu-24.04
2222
steps:
2323
- name: Checkout this Repository
24-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
24+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2525
with:
2626
ref: "${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}"
2727
path: self
2828

2929
- name: Get all changed files in the PR from task directory
3030
id: changed-task-dirs
31-
uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v47.0.0
31+
uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96 # v47.0.6
3232
with:
3333
files: |
3434
# Any task yaml or script (including its tests) is changed
@@ -64,15 +64,15 @@ jobs:
6464

6565
- name: Checkout konflux-ci/konflux-ci Repository
6666
if: steps.changed-task-dirs.outputs.any_changed == 'true'
67-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
67+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
6868
with:
6969
repository: 'konflux-ci/konflux-ci'
7070
path: konflux-ci
71-
ref: 3a694f8d7b49e74f476bb9414fc3e6d03d50ae37
71+
ref: f534315051ccafa8197ea6491a0fdc5ba88ec793
7272

7373
- name: Create k8s Kind Cluster
7474
if: steps.changed-task-dirs.outputs.any_changed == 'true'
75-
uses: helm/kind-action@92086f6be054225fa813e0a4b13787fc9088faab # v1.13.0
75+
uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc # v1.14.0
7676
with:
7777
config: konflux-ci/kind-config.yaml
7878

‎.github/workflows/task-lint.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: "Checkout this repository"
24-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
24+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2525

2626
- name: "Install yq"
27-
uses: mikefarah/yq@7ccaf8e700ce99eb3f0f6cef7f5930a0b3c827cd # v4.49.2
27+
uses: mikefarah/yq@1b9b4ac5187171d2e5e3129be0cfa827c7f9d53d # v4.53.3
2828
with:
2929
# Version from https://github.com/mikefarah/yq/releases
3030
version: 'v4.47.1'

‎.github/workflows/update-shared-ci.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
update:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
18+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
1919
with:
2020
# cruft works better with full git history
2121
fetch-depth: 0
@@ -106,7 +106,7 @@ jobs:
106106
107107
bash "$renovate_update_script"
108108
109-
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
109+
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
110110
id: app-token
111111
with:
112112
# These may already be set globally for your organization
@@ -115,7 +115,7 @@ jobs:
115115
private-key: ${{ secrets.SHARED_CI_UPDATER_PRIVATE_KEY }}
116116

117117
- name: Create pull request if needed
118-
uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676 # v7.0.11
118+
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
119119
with:
120120
token: ${{ steps.app-token.outputs.token }}
121121
title: Update shared CI files

‎.github/workflows/versioning.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Check out code
18-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
18+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
1919
with:
2020
fetch-depth: 0
2121

0 commit comments

Comments
 (0)