From 417bb528c8ed1fb63ec51e216b79f4947a34cf28 Mon Sep 17 00:00:00 2001 From: Brandt Keller Date: Thu, 15 Aug 2024 21:06:46 +0000 Subject: [PATCH 1/4] fix(ci): update to docker compose v2 Signed-off-by: Brandt Keller --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 702776dab..788d76203 100644 --- a/Makefile +++ b/Makefile @@ -4,24 +4,24 @@ all: setup lint spelling links .PHONY: setup setup: @echo "Running $@...\n\n" - @docker-compose run $@ ci/$@.sh - @docker-compose down + @docker compose run $@ ci/$@.sh + @docker compose down .PHONY: lint lint: @echo "Running $@...\n\n" - @docker-compose run $@ ci/$@.sh - @docker-compose down + @docker compose run $@ ci/$@.sh + @docker compose down .PHONY: spelling spelling: @echo "Running $@...\n\n" - @docker-compose run $@ ci/$@.sh - @docker-compose down + @docker compose run $@ ci/$@.sh + @docker compose down .PHONY: links links: @echo "Running $@...\n\n" - @docker-compose run $@ ci/$@.sh - @docker-compose down + @docker compose run $@ ci/$@.sh + @docker compose down From 2191621f63ed33e770d6c078e723267a18b5e1ba Mon Sep 17 00:00:00 2001 From: Brandt Keller Date: Thu, 15 Aug 2024 21:09:19 +0000 Subject: [PATCH 2/4] fix(ci): test file to reproduce issue Signed-off-by: Brandt Keller --- community/automated-governance/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community/automated-governance/README.md b/community/automated-governance/README.md index 9045a3e43..8f5707de1 100644 --- a/community/automated-governance/README.md +++ b/community/automated-governance/README.md @@ -24,5 +24,5 @@ The scope of this project includes: ## Contact -- **Lead:** Andrés Vega, Brandt Keller +- **Lead:** Matthew Flannery, Brandt Keller - **Slack Channel:** [Link](https://cloud-native.slack.com/archives/C06B26A12AF) From 3ad6dccba423e763698020a3dafb5dfe51b7f6ce Mon Sep 17 00:00:00 2001 From: Brandt Keller Date: Thu, 15 Aug 2024 21:16:20 +0000 Subject: [PATCH 3/4] fix(ci): revert tested changes and remove obsolete version Signed-off-by: Brandt Keller --- community/automated-governance/README.md | 2 +- docker-compose.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/community/automated-governance/README.md b/community/automated-governance/README.md index 8f5707de1..9045a3e43 100644 --- a/community/automated-governance/README.md +++ b/community/automated-governance/README.md @@ -24,5 +24,5 @@ The scope of this project includes: ## Contact -- **Lead:** Matthew Flannery, Brandt Keller +- **Lead:** Andrés Vega, Brandt Keller - **Slack Channel:** [Link](https://cloud-native.slack.com/archives/C06B26A12AF) diff --git a/docker-compose.yml b/docker-compose.yml index 09a11250b..a35f2433a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '2' services: setup: image: node:18 From 0e7e25b1fa4c4575bbb0cdb595a457e109f21a05 Mon Sep 17 00:00:00 2001 From: Brandt Keller Date: Thu, 15 Aug 2024 21:21:37 +0000 Subject: [PATCH 4/4] fix(ci): update checkout action and pin to checksum Signed-off-by: Brandt Keller --- .github/workflows/sig-sec-check.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sig-sec-check.yml b/.github/workflows/sig-sec-check.yml index 415194275..c0cede4b2 100644 --- a/.github/workflows/sig-sec-check.yml +++ b/.github/workflows/sig-sec-check.yml @@ -11,27 +11,27 @@ jobs: Setup: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup run: make setup Lint: runs-on: ubuntu-latest needs: Setup steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Lint run: make lint Spelling: runs-on: ubuntu-latest needs: Setup steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Spelling run: make spelling Links: runs-on: ubuntu-latest needs: Setup steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Links run: make links