From bd48bea2c05f9afe8f3014245272c5347c08d7e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Vega?= Date: Wed, 14 Aug 2024 10:15:06 -0700 Subject: [PATCH 1/2] Update README to updated meeting link on LFX platform (#1345) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andrés Vega --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 94e4ddb32..5d2d3ee48 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ Join our open discussions and share news: ## Meeting Information -- **Americas**: Weekly on Wednesdays at 10 am (UTC-7). [Zoom link](https://zoom.us/j/99809474566), Meeting ID: 998 0947 4566. +- **Americas**: Weekly on Wednesdays at 10 am (UTC-7). [Zoom link](https://zoom-lfx.platform.linuxfoundation.org/meeting/92340369657?password=76e24ffd-69f2-41a8-8aed-13796805225d), Meeting ID: 923 4036 9657. - **EMEA**: Bi-weekly on Wednesdays at 1 pm UTC+0 (adjusts for daylight saving). [Zoom link](https://zoom.us/j/99917523142), Meeting ID: 999 1752 3142. Check your local timezone [here](https://time.is/). Meetings are listed on the [CNCF calendar](https://www.cncf.io/calendar/) and the [TAG Security Calendar](https://calendar.google.com/calendar/u/0?cid=MGI4dTVlbDh0YTRzOTN0MmNtNzJ0dXZoaGtAZ3JvdXAuY2FsZW5kYXIuZ29vZ2xlLmNvbQ). From ba3732fa7d8cac56015bf704649a191c11216dad Mon Sep 17 00:00:00 2001 From: Brandt Keller <43887158+brandtkeller@users.noreply.github.com> Date: Thu, 15 Aug 2024 14:32:12 -0700 Subject: [PATCH 2/2] fix(ci): update Makefile to docker compose v2 (#1347) * fix(ci): update to docker compose v2 Signed-off-by: Brandt Keller * fix(ci): test file to reproduce issue Signed-off-by: Brandt Keller * fix(ci): revert tested changes and remove obsolete version Signed-off-by: Brandt Keller * fix(ci): update checkout action and pin to checksum Signed-off-by: Brandt Keller --------- Signed-off-by: Brandt Keller --- .github/workflows/sig-sec-check.yml | 8 ++++---- Makefile | 16 ++++++++-------- docker-compose.yml | 1 - 3 files changed, 12 insertions(+), 13 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 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 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