Skip to content

Commit

Permalink
Merge branch 'dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
h3mmy authored Feb 18, 2024
2 parents a104193 + 7161706 commit c4bdfab
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/actions/collect-changes/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ runs:
using: "composite"
steps:
- name: Collect changed files
uses: dorny/paths-filter@v2
uses: dorny/paths-filter@v3
id: filter
with:
list-files: json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/charts-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
chart: "charts/${{ matrix.chart }}"

- name: Install Kubernetes tools
uses: yokawasa/action-setup-kube-tools@v0.9.3
uses: yokawasa/action-setup-kube-tools@v0.10.0
with:
setup-tools: |
helmv3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/charts-release-oci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
fetch-depth: 0

- name: Install Kubernetes tools
uses: yokawasa/action-setup-kube-tools@v0.9.3
uses: yokawasa/action-setup-kube-tools@v0.10.0
with:
setup-tools: |
helmv3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/charts-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
ref: ${{ inputs.checkoutCommit }}

- name: Install Kubernetes tools
uses: yokawasa/action-setup-kube-tools@v0.9.3
uses: yokawasa/action-setup-kube-tools@v0.10.0
with:
setup-tools: |
helmv3
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
ref: ${{ inputs.checkoutCommit }}

- name: Install Kubernetes tools
uses: yokawasa/action-setup-kube-tools@v0.9.3
uses: yokawasa/action-setup-kube-tools@v0.10.0
with:
setup-tools: |
helmv3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
fetch-depth: 0

- name: Collect changed files
uses: dorny/paths-filter@v2
uses: dorny/paths-filter@v3
id: changed-files
with:
list-files: json
Expand Down
14 changes: 7 additions & 7 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.helm:
image:
name: alpine/helm:latest@sha256:a90798c9c2b671e3546b10db1ae0b845f9abccc9f9ff79b34744a1ba146b67ed
name: alpine/helm:latest@sha256:b8b29460fecb0e64c0adbab2f506382056f1a9105e771595bc6871ad859b65a5
entrypoint: [""]
variables:
CHART_NAME: bloopyboi
Expand Down Expand Up @@ -47,10 +47,10 @@ stages:

docker_build:
# Use the official docker image.
image: docker:latest@sha256:915cd1624f521b6337f135075f712c8fb14c0b151595c6144d7ce05d2f257869
image: docker:latest@sha256:28940f5d0a45dcb945f339636073bf4865cbc7df126a11cdc73531350cecee8a
stage: build
services:
- docker:dind@sha256:915cd1624f521b6337f135075f712c8fb14c0b151595c6144d7ce05d2f257869
- docker:dind@sha256:28940f5d0a45dcb945f339636073bf4865cbc7df126a11cdc73531350cecee8a
before_script:
- !reference [.docker, before_script]
script:
Expand Down Expand Up @@ -79,9 +79,9 @@ docker_build:

# Tags only the $CI_DEFAULT_BRANCH as latest
push_latest:
image: docker:latest@sha256:915cd1624f521b6337f135075f712c8fb14c0b151595c6144d7ce05d2f257869
image: docker:latest@sha256:28940f5d0a45dcb945f339636073bf4865cbc7df126a11cdc73531350cecee8a
services:
- docker:dind@sha256:915cd1624f521b6337f135075f712c8fb14c0b151595c6144d7ce05d2f257869
- docker:dind@sha256:28940f5d0a45dcb945f339636073bf4865cbc7df126a11cdc73531350cecee8a
variables:
# Disable fresh pull of source
GIT_STRATEGY: none
Expand All @@ -98,9 +98,9 @@ push_latest:
- docker push $CI_REGISTRY_IMAGE:latest

push_tag:
image: docker:latest@sha256:915cd1624f521b6337f135075f712c8fb14c0b151595c6144d7ce05d2f257869
image: docker:latest@sha256:28940f5d0a45dcb945f339636073bf4865cbc7df126a11cdc73531350cecee8a
services:
- docker:dind@sha256:915cd1624f521b6337f135075f712c8fb14c0b151595c6144d7ce05d2f257869
- docker:dind@sha256:28940f5d0a45dcb945f339636073bf4865cbc7df126a11cdc73531350cecee8a
variables:
GIT_STRATEGY: none
stage: push
Expand Down

0 comments on commit c4bdfab

Please sign in to comment.