Skip to content

Commit 6209f87

Browse files
authored
Merge branch 'main' into dependabot/pip/plugins/traction_innkeeper/ruff-0.15.16
2 parents 5cf1a17 + 9805c30 commit 6209f87

12 files changed

Lines changed: 71 additions & 57 deletions

File tree

.github/actions/build_acapy/action.yaml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,23 +41,26 @@ outputs:
4141
runs:
4242
using: "composite"
4343
steps:
44-
- uses: actions/checkout@v4
44+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4545
with:
4646
ref: ${{ inputs.ref != '' && inputs.ref || env.GITHUB_REF }}
4747

48+
- name: Set up QEMU
49+
uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
50+
4851
- name: Set up Docker Buildx
49-
uses: docker/setup-buildx-action@v3
52+
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
5053

5154
- name: Login to GitHub Container Registry
52-
uses: docker/login-action@v3
55+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
5356
with:
5457
registry: ${{ inputs.registry}}
5558
username: ${{ inputs.registry_username}}
5659
password: ${{ inputs.registry_password }}
5760

5861
- name: Prepare docker tags for image
5962
id: meta
60-
uses: docker/metadata-action@v5
63+
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
6164
with:
6265
images: ${{ inputs.registry }}/${{ inputs.image_name }}
6366
tags: |
@@ -68,15 +71,19 @@ runs:
6871
6972
- name: Build and push image
7073
id: builder
71-
uses: docker/build-push-action@v6
74+
uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
7275
with:
7376
context: ${{ inputs.context }}
7477
file: ${{ inputs.dockerfile }}
7578
push: true
79+
platforms: linux/amd64,linux/arm64
7680
tags: ${{ steps.meta.outputs.tags }}
7781
labels: ${{ steps.meta.outputs.labels }}
78-
cache-from: type=registry,ref=ghcr.io/${{ github.repository }}/acapy-buildcache:main
79-
cache-to: type=registry,ref=ghcr.io/${{ github.repository }}/acapy-buildcache:main,mode=max,ttl=168h
82+
annotations: ${{ steps.meta.outputs.annotations }}
83+
provenance: mode=min
84+
sbom: true
85+
cache-from: type=gha
86+
cache-to: type=gha,mode=max
8087

8188
- id: values
8289
shell: bash

.github/actions/build_ui/action.yaml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ outputs:
3636
runs:
3737
using: "composite"
3838
steps:
39-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4040
with:
4141
ref: ${{ inputs.ref != '' && inputs.ref || env.GITHUB_REF }}
4242

4343
- name: Set up Node
44-
uses: actions/setup-node@master
44+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
4545
with:
4646
node-version: 24
4747
cache: npm
@@ -83,19 +83,22 @@ runs:
8383
cd ${{ inputs.context }}/frontend
8484
npm run build
8585
86+
- name: Set up QEMU
87+
uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
88+
8689
- name: Set up Docker Buildx
87-
uses: docker/setup-buildx-action@v3
90+
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
8891

8992
- name: Login to GitHub Container Registry
90-
uses: docker/login-action@v3
93+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
9194
with:
9295
registry: ${{ inputs.registry}}
9396
username: ${{ inputs.registry_username}}
9497
password: ${{ inputs.registry_password }}
9598

9699
- name: Prepare docker tags for image
97100
id: meta
98-
uses: docker/metadata-action@v5
101+
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
99102
with:
100103
images: ${{ inputs.registry }}/${{ inputs.image_name }}
101104
tags: |
@@ -106,14 +109,18 @@ runs:
106109
107110
- name: Build and push image
108111
id: builder
109-
uses: docker/build-push-action@v6
112+
uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
110113
with:
111114
context: ${{ inputs.context }}
112115
push: true
116+
platforms: linux/amd64,linux/arm64
113117
tags: ${{ steps.meta.outputs.tags }}
114118
labels: ${{ steps.meta.outputs.labels }}
115-
cache-from: type=registry,ref=ghcr.io/${{ github.repository }}/ui-buildcache:main
116-
cache-to: type=registry,ref=ghcr.io/${{ github.repository }}/ui-buildcache:main,mode=max,ttl=168h
119+
annotations: ${{ steps.meta.outputs.annotations }}
120+
provenance: mode=min
121+
sbom: true
122+
cache-from: type=gha
123+
cache-to: type=gha,mode=max
117124

118125
- id: values
119126
shell: bash

.github/workflows/chart_release.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
if: github.repository_owner == 'bcgov'
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v6
18+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
1919
with:
2020
ref: gh-pages
2121
- name: Download remote index file and check equality
@@ -32,15 +32,15 @@ jobs:
3232
if: github.repository_owner == 'bcgov'
3333
needs: [ validate-chart-index ]
3434
steps:
35-
- uses: actions/checkout@v6
35+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3636
with:
3737
fetch-depth: 0
3838
- name: Configure Git
3939
run: |
4040
git config user.name "$GITHUB_ACTOR"
4141
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
4242
- name: Install Helm
43-
uses: azure/setup-helm@v5
43+
uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0
4444
- name: Add repositories
4545
run: |
4646
helm repo add bitnami https://charts.bitnami.com/bitnami
@@ -58,10 +58,10 @@ jobs:
5858
needs:
5959
- chart-release
6060
steps:
61-
- uses: actions/checkout@v6
61+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
6262

6363
- name: Checkout services directory from the ministry-gitops-ditp repo
64-
uses: actions/checkout@v6
64+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
6565
with:
6666
repository: bcgov-c/ministry-gitops-ditp
6767
ssh-key: ${{ secrets.DITP_GITOPS_REPO_SECRET }}

.github/workflows/delete_images.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: Delete old container images
22

33
on:
4-
# schedule:
5-
# - cron: "0 2 * * 2" # This job runs every Tuesday
4+
schedule:
5+
- cron: "0 2 * * 2" # This job runs every Tuesday
66
workflow_dispatch:
77

88
jobs:
@@ -12,7 +12,7 @@ jobs:
1212
if: github.repository_owner == 'bcgov'
1313
steps:
1414
- name: Delete container images older than a Month
15-
uses: snok/container-retention-policy@v3.0.1
15+
uses: snok/container-retention-policy@d3bdcf5ce9b05f685154e4a16c39233b245e3d53 # v3.1.0
1616
with:
1717
account: bcgov
1818
image-names: traction-plugins-acapy, traction-tenant-proxy, traction-tenant-ui

.github/workflows/on_pr_closed.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ jobs:
1717
runs-on: ubuntu-22.04
1818
if: github.repository_owner == 'bcgov'
1919
steps:
20-
- uses: actions/checkout@v6
20+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2121
- name: Check out manifest repo
22-
uses: actions/checkout@v6
22+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2323
with:
2424
ssh-key: ${{ secrets.MANIFEST_REPO_DEPLOY_KEY }}
2525
repository: ${{ secrets.MANIFEST_REPO }}
2626
path: charts-repo
2727

2828
- name: Authenticate and set context
29-
uses: redhat-actions/oc-login@v1
29+
uses: redhat-actions/oc-login@5eb45e848b168b6bf6b8fe7f1561003c12e3c99d # v1.3
3030
with:
3131
openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }}
3232
openshift_token: ${{ secrets.OPENSHIFT_TOKEN }}
@@ -44,11 +44,11 @@ jobs:
4444
4545
clean-ghcr:
4646
runs-on: ubuntu-22.04
47-
if: ${{ false }}
47+
if: ${{ always }}
4848
name: Delete closed PR images
4949
steps:
5050
- name: Delete Images
51-
uses: snok/container-retention-policy@v3.0.1
51+
uses: snok/container-retention-policy@d3bdcf5ce9b05f685154e4a16c39233b245e3d53 # v3.1.0
5252
with:
5353
account: bcgov
5454
image-names: traction-plugins-acapy, traction-tenant-proxy, traction-tenant-ui

.github/workflows/on_pr_opened.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
needs:
3939
- ready
4040
steps:
41-
- uses: actions/checkout@v6
41+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4242
- name: Build UI
4343
uses: ./.github/actions/build_ui
4444
id: builder
@@ -60,7 +60,7 @@ jobs:
6060
needs:
6161
- ready
6262
steps:
63-
- uses: actions/checkout@v6
63+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
6464
- name: Build Aca-Py Image
6565
uses: ./.github/actions/build_acapy
6666
id: builder
@@ -81,7 +81,7 @@ jobs:
8181
needs:
8282
- ready
8383
steps:
84-
- uses: actions/checkout@v6
84+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
8585
- name: Build Tenant Proxy Image
8686
uses: ./.github/actions/build_acapy
8787
id: builder
@@ -106,15 +106,15 @@ jobs:
106106
if: ${{ always() && (fromJSON(needs.ready.outputs.deploy) == true) && !(contains(needs.*.result, 'failure')) }}
107107

108108
steps:
109-
- uses: actions/checkout@v6
109+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
110110

111111
- name: Install OpenShift CLI tools
112-
uses: redhat-actions/openshift-tools-installer@v1
112+
uses: redhat-actions/openshift-tools-installer@144527c7d98999f2652264c048c7a9bd103f8a82 # v1.13.1
113113
with:
114114
oc: "4.14"
115115

116116
- name: Authenticate and set context
117-
uses: redhat-actions/oc-login@v1
117+
uses: redhat-actions/oc-login@5eb45e848b168b6bf6b8fe7f1561003c12e3c99d # v1.3
118118
with:
119119
openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }}
120120
openshift_token: ${{ secrets.OPENSHIFT_TOKEN }}
@@ -137,10 +137,10 @@ jobs:
137137
- deploy
138138
if: ${{ (fromJSON(needs.ready.outputs.deploy) == true) && !(contains(needs.*.result, 'failure')) }}
139139
steps:
140-
- uses: actions/checkout@v6
140+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
141141

142142
- name: Find Comment
143-
uses: peter-evans/find-comment@v4
143+
uses: peter-evans/find-comment@b30e6a3c0ed37e7c023ccd3f1db5c6c0b0c23aad # v4.0.0
144144
id: fc
145145
with:
146146
issue-number: ${{ github.event.number }}
@@ -149,7 +149,7 @@ jobs:
149149

150150
- name: Create comment
151151
if: steps.fc.outputs.comment-id == ''
152-
uses: peter-evans/create-or-update-comment@v5
152+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
153153
with:
154154
issue-number: ${{ github.event.number }}
155155
body: |

.github/workflows/on_push_main.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
if: github.repository_owner == 'bcgov'
1717
steps:
18-
- uses: actions/checkout@v6
18+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
1919
- name: Build service
2020
uses: ./.github/actions/build_ui
2121
id: builder
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535
if: github.repository_owner == 'bcgov'
3636
steps:
37-
- uses: actions/checkout@v6
37+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3838
- name: Build Aca-Py Image
3939
uses: ./.github/actions/build_acapy
4040
id: builder
@@ -54,7 +54,7 @@ jobs:
5454
runs-on: ubuntu-latest
5555
if: github.repository_owner == 'bcgov'
5656
steps:
57-
- uses: actions/checkout@v6
57+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
5858
- name: Build Aca-Py Image
5959
uses: ./.github/actions/build_acapy
6060
id: builder
@@ -78,10 +78,10 @@ jobs:
7878
- build_proxy
7979
if: ${{ contains(needs.*.result, 'success') && !(contains(needs.*.result, 'failure')) && (github.repository_owner == 'bcgov') }}
8080
steps:
81-
- uses: actions/checkout@v6
81+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
8282

8383
- name: Checkout services directory from the ministry-gitops-ditp repo
84-
uses: actions/checkout@v6
84+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
8585
with:
8686
repository: bcgov-c/ministry-gitops-ditp
8787
ssh-key: ${{ secrets.DITP_GITOPS_REPO_SECRET }}
@@ -90,12 +90,12 @@ jobs:
9090
path: ministry-gitops-ditp
9191

9292
- name: Install OpenShift CLI tools
93-
uses: redhat-actions/openshift-tools-installer@v1
93+
uses: redhat-actions/openshift-tools-installer@144527c7d98999f2652264c048c7a9bd103f8a82 # v1.13.1
9494
with:
9595
oc: "4.14"
9696

9797
- name: Authenticate and set context
98-
uses: redhat-actions/oc-login@v1
98+
uses: redhat-actions/oc-login@5eb45e848b168b6bf6b8fe7f1561003c12e3c99d # v1.3
9999
with:
100100
openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }}
101101
openshift_token: ${{ secrets.OPENSHIFT_TOKEN }}

.github/workflows/release_assets.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
if: github.repository_owner == 'bcgov'
1818
steps:
19-
- uses: actions/checkout@v6
19+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2020
- name: Build Aca-Py Image
2121
uses: ./.github/actions/build_acapy
2222
id: builder
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: ubuntu-latest
3434
if: github.repository_owner == 'bcgov'
3535
steps:
36-
- uses: actions/checkout@v6
36+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3737
- name: Build UI
3838
uses: ./.github/actions/build_ui
3939
id: builder
@@ -49,7 +49,7 @@ jobs:
4949
runs-on: ubuntu-latest
5050
if: github.repository_owner == 'bcgov'
5151
steps:
52-
- uses: actions/checkout@v6
52+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
5353
- name: Build Tenant Proxy Image
5454
uses: ./.github/actions/build_acapy
5555
id: builder

.github/workflows/stale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-22.04
1111
if: github.repository_owner == 'bcgov'
1212
steps:
13-
- uses: actions/stale@v10
13+
- uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10.3.0
1414
with:
1515
stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
1616
stale-pr-message: 'This PR is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 10 days.'

.github/workflows/test_innkeeper_plugin.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ jobs:
1818
# Check out repo
1919
#----------------------------------------------
2020
- name: Check out repository
21-
uses: actions/checkout@v6
21+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2222
#----------------------------------------------
2323
# Install python and poetry with cache
2424
#----------------------------------------------
25-
- uses: actions/setup-python@v6
25+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
2626
id: setup-python
2727
with:
2828
python-version: "3.13"
2929
- name: Install poetry
30-
uses: snok/install-poetry@v1
30+
uses: snok/install-poetry@a783c322200f0519c7926aa6faa857c4e23e9263 # v1.4.2
3131
with:
3232
version: 2.1.1
3333
virtualenvs-create: true

0 commit comments

Comments
 (0)