From 61e102d60da668c17be1e16c02b2c0d4a837e7dd Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Mon, 22 Nov 2021 10:13:17 +0100 Subject: [PATCH 001/338] feat: implement patch based build system for act fork MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This system allows a curated list of patches to be applied to an upstream version of act. It then builds and releases the patched version in our repository releases. Co-authored-by: "Björn Brauer " --- .github/workflows/build-with-patches.yml | 106 +++++++++++++++++++++++ .gitmodules | 3 + Makefile | 11 +++ act | 1 + apply-patches.sh | 11 +++ patches | 2 + version-hash.sh | 21 +++++ 7 files changed, 155 insertions(+) create mode 100644 .github/workflows/build-with-patches.yml create mode 100644 .gitmodules create mode 100644 Makefile create mode 160000 act create mode 100755 apply-patches.sh create mode 100644 patches create mode 100755 version-hash.sh diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml new file mode 100644 index 00000000000..7f0fdf215a9 --- /dev/null +++ b/.github/workflows/build-with-patches.yml @@ -0,0 +1,106 @@ +name: Build act with patches + +on: [push] + +env: + GO_VERSION: 1.17 + +jobs: + calculate-tag: + runs-on: ubuntu-latest + outputs: + tag: ${{ steps.release-tag.outputs.tag }} + latest: ${{ steps.release-tag.outputs.latest }} + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + submodules: true + - id: release-tag + name: compute release tag + run: | + version=$(cd act && git describe --tags --dirty --always |cut -d "-" -f 1) + hash=$(./version-hash.sh) + + tag="${version}-${hash}" + echo ::set-output name=tag::${tag} + + latest="$(curl -fsSLI -o /dev/null -w "%{url_effective}" https://github.com/xing/act/releases/latest)" + latest="${latest#https://github.com/xing/act/releases/tag/}" + echo ::set-output name=latest::${latest} + + build: + runs-on: ubuntu-latest + needs: [calculate-tag] + if: needs.calculate-tag.outputs.tag != needs.calculate-tag.outputs.latest + steps: + - uses: actions/checkout@v2 + with: + submodules: true + - name: setup git + run: | + git config --global user.name github-actions + git config --global user.email github-actions@github.com + - uses: actions/setup-go@v2 + with: + go-version: ${{ env.GO_VERSION }} + - name: compile + run: | + make act-build + + test: + runs-on: ubuntu-latest + needs: [calculate-tag] + if: needs.calculate-tag.outputs.tag != needs.calculate-tag.outputs.latest + steps: + - uses: actions/checkout@v2 + with: + submodules: true + - name: setup git + run: | + git config --global user.name github-actions + git config --global user.email github-actions@github.com + - uses: actions/setup-go@v2 + with: + go-version: ${{ env.GO_VERSION }} + - uses: docker/setup-qemu-action@v1 + - uses: actions/cache@v2 + with: + path: ~/go/pkg/mod + key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} + restore-keys: | + ${{ runner.os }}-go- + - run: | + make act-test + + tag-release: + runs-on: ubuntu-latest + needs: ["build", "test"] + if: needs.calculate-tag.outputs.tag != needs.calculate-tag.outputs.latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + submodules: true + - name: create release tag + run: | + git config --global user.name github-actions + git config --global user.email github-actions@github.com + make patch + + # tag version in submodule and parent + cd act + git tag "${{ needs.calculate-tag.outputs.tag }}" + cd .. + git tag "${{ needs.calculate-tag.outputs.tag }}" + - uses: actions/setup-go@v2 + with: + go-version: ${{ env.GO_VERSION }} + - name: GoReleaser + uses: goreleaser/goreleaser-action@v1 + with: + version: latest + workdir: ./act + args: release --rm-dist + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000000..45d32f2d08d --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "act"] + path = act + url = https://github.com/nektos/act diff --git a/Makefile b/Makefile new file mode 100644 index 00000000000..d2938a91ef3 --- /dev/null +++ b/Makefile @@ -0,0 +1,11 @@ +.PHONY: patch +patch: + ./apply-patches.sh + +.PHONY: act-build +act-build: patch + $(MAKE) -C act build + +.PHONY: act-test +act-test: patch + cd act && go test -v ./... diff --git a/act b/act new file mode 160000 index 00000000000..96cf907c5e1 --- /dev/null +++ b/act @@ -0,0 +1 @@ +Subproject commit 96cf907c5e1f4761ef6d91bb8e22487747a77f6b diff --git a/apply-patches.sh b/apply-patches.sh new file mode 100755 index 00000000000..e6d80a58f82 --- /dev/null +++ b/apply-patches.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +set -euxo pipefail + +cd act || exit 1 + +grep -v '^#' < ../patches | while IFS= read -r patch +do + echo "Applying patch $patch" + curl -L "$patch" | git am -3 || exit 1 +done diff --git a/patches b/patches new file mode 100644 index 00000000000..46111f540e0 --- /dev/null +++ b/patches @@ -0,0 +1,2 @@ +https://github.com/xing/act/pull/23.patch +https://github.com/xing/act/pull/22.patch diff --git a/version-hash.sh b/version-hash.sh new file mode 100755 index 00000000000..a9fe04648a2 --- /dev/null +++ b/version-hash.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +set -euxo pipefail + +cd act || exit 1 + + +temp=$(mktemp -d -t act-patches-XXXXXXXXXX) + +git describe --tags --dirty --always > "$temp/upstream" + +grep -v '^#' < ../patches | while IFS= read -r patch +do + curl -L "$patch" > "$temp/${patch//\//_}" +done + +hash=$(cat "$temp"/* | md5sum |cut -d " " -f 1) + +rm -rf "$temp" + +echo "${hash:0:7}" From 44911e513fee8e1fbce8cd6212913fcb324717a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 09:48:28 +0000 Subject: [PATCH 002/338] feat: add our open act PRs as patches - feat: allow existing logger from context - feat: read docker credentials from local docker config - feat: try to read ref and sha from event payload if available - fix: continue jobs + steps after failure Co-authored-by: Markus Wolf --- patches | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/patches b/patches index 46111f540e0..e93f9a6213e 100644 --- a/patches +++ b/patches @@ -1,2 +1,6 @@ https://github.com/xing/act/pull/23.patch https://github.com/xing/act/pull/22.patch +https://github.com/nektos/act/pull/898.patch +https://github.com/nektos/act/pull/891.patch +https://github.com/nektos/act/pull/889.patch +https://github.com/nektos/act/pull/840.patch From 4a02a108e52758db729a4900500c7e55d418665e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 10:02:52 +0000 Subject: [PATCH 003/338] chore: trigger release only on distribution branch Co-authored-by: Markus Wolf --- .github/workflows/build-with-patches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index 7f0fdf215a9..e9d96b67ad4 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -76,7 +76,7 @@ jobs: tag-release: runs-on: ubuntu-latest needs: ["build", "test"] - if: needs.calculate-tag.outputs.tag != needs.calculate-tag.outputs.latest + if: github.ref == 'refs/heads/distribution' && needs.calculate-tag.outputs.tag != needs.calculate-tag.outputs.latest steps: - uses: actions/checkout@v2 with: From dd438fb85dfb980053da47e71fc4f9446bfec03e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 10:27:58 +0000 Subject: [PATCH 004/338] chore: silence curl and version-hash script output Co-authored-by: Markus Wolf --- version-hash.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version-hash.sh b/version-hash.sh index a9fe04648a2..a49a92db126 100755 --- a/version-hash.sh +++ b/version-hash.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail cd act || exit 1 @@ -11,7 +11,7 @@ git describe --tags --dirty --always > "$temp/upstream" grep -v '^#' < ../patches | while IFS= read -r patch do - curl -L "$patch" > "$temp/${patch//\//_}" + curl -sL "$patch" > "$temp/${patch//\//_}" done hash=$(cat "$temp"/* | md5sum |cut -d " " -f 1) From 44805fc8619421241411d0414a61c13819caa6f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 10:30:29 +0000 Subject: [PATCH 005/338] chore: print tag and latest version in workflow Co-authored-by: Markus Wolf --- .github/workflows/build-with-patches.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index e9d96b67ad4..bd94c37312d 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -29,6 +29,8 @@ jobs: latest="${latest#https://github.com/xing/act/releases/tag/}" echo ::set-output name=latest::${latest} + echo "tag: ${tag} latest: ${latest}" + build: runs-on: ubuntu-latest needs: [calculate-tag] From a648ba963f0f3cdc22fb6bba91f8ee1e0b5f2bcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 10:36:03 +0000 Subject: [PATCH 006/338] chore: silence curl and script output from apply-patches.sh Co-authored-by: Markus Wolf --- apply-patches.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apply-patches.sh b/apply-patches.sh index e6d80a58f82..a0b9fcd085f 100755 --- a/apply-patches.sh +++ b/apply-patches.sh @@ -1,11 +1,11 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail cd act || exit 1 grep -v '^#' < ../patches | while IFS= read -r patch do - echo "Applying patch $patch" - curl -L "$patch" | git am -3 || exit 1 + echo "Patch from: $patch" + curl -sL "$patch" | git am -3 || exit 1 done From d3747d3f209a9927859cdebcb9a2471356617c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 10:37:35 +0000 Subject: [PATCH 007/338] chore: fix needs for tag-release job Co-authored-by: Markus Wolf --- .github/workflows/build-with-patches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index bd94c37312d..bb9e3499584 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -77,7 +77,7 @@ jobs: tag-release: runs-on: ubuntu-latest - needs: ["build", "test"] + needs: ["calculate-tag", "build", "test"] if: github.ref == 'refs/heads/distribution' && needs.calculate-tag.outputs.tag != needs.calculate-tag.outputs.latest steps: - uses: actions/checkout@v2 From f92e23629a7b92d7371be5756018adb695caa793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 10:48:49 +0000 Subject: [PATCH 008/338] docs: add comments to patches file Co-authored-by: Markus Wolf --- patches | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/patches b/patches index e93f9a6213e..389f0d32ba5 100644 --- a/patches +++ b/patches @@ -1,6 +1,14 @@ +# these patches will stay downstream forever +# update owner name from nektos to xing https://github.com/xing/act/pull/23.patch +# customize goreleaser configuration https://github.com/xing/act/pull/22.patch +# ------------------------------------------- +# feat: allow existing logger from context https://github.com/nektos/act/pull/898.patch +# feat: read docker credentials from local docker config https://github.com/nektos/act/pull/891.patch +# feat: try to read ref and sha from event payload if available https://github.com/nektos/act/pull/889.patch +# fix: continue jobs + steps after failure https://github.com/nektos/act/pull/840.patch From af15a27b777c7b23ae4752caefae01ceec7295d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 10:49:43 +0000 Subject: [PATCH 009/338] feat: add patch for "Feature: uses in composite" Co-authored-by: Markus Wolf --- patches | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches b/patches index 389f0d32ba5..002f0d21c34 100644 --- a/patches +++ b/patches @@ -12,3 +12,5 @@ https://github.com/nektos/act/pull/891.patch https://github.com/nektos/act/pull/889.patch # fix: continue jobs + steps after failure https://github.com/nektos/act/pull/840.patch +# Feature: uses in composite +https://github.com/xing/act/pull/26.patch \ No newline at end of file From 80f098461664629118dc26b5736472fe1c20aeeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 13:26:01 +0000 Subject: [PATCH 010/338] chore: add clean target to reset the submodule to origin/master Co-authored-by: Markus Wolf --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index d2938a91ef3..f4490401cbf 100644 --- a/Makefile +++ b/Makefile @@ -9,3 +9,7 @@ act-build: patch .PHONY: act-test act-test: patch cd act && go test -v ./... + +.PHONE: clean +clean: + git submodule foreach git reset --hard origin/master From faf06cc1275480b9fa5da2b2539e31fbce2a9cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 13:27:08 +0000 Subject: [PATCH 011/338] chore: add editorconfig Co-authored-by: Markus Wolf --- .editorconfig | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000000..0eef8b2bd9c --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +[*] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +indent_style = space +indent_size = 2 + +[*.md] +trim_trailing_whitespace = false + +[*.yml] +trim_trailing_whitespace = false From 2592fbcf64384ffb74eb843961f290d7c48d62a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 13:34:59 +0000 Subject: [PATCH 012/338] chore: automatically update origin/master with upstream/master Co-authored-by: Markus Wolf --- .github/workflows/sync-upstream.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/sync-upstream.yml diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml new file mode 100644 index 00000000000..074e94fc4e5 --- /dev/null +++ b/.github/workflows/sync-upstream.yml @@ -0,0 +1,19 @@ +name: Sync latest upstream master into local master + +on: + schedule: + - cron: "0 5 * * *" + workflow_dispatch: + +jobs: + sync: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + ref: master + - run: | + git remote add upstream git@github.com:nektos/act.git + git fetch upstream + git reset --hard upstream/master + git push --force origin master From cd7117230348a6431bd80242c100280e04548979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 13:40:30 +0000 Subject: [PATCH 013/338] chore: let sync workflow run now Co-authored-by: Markus Wolf --- .github/workflows/sync-upstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml index 074e94fc4e5..e5a459deeb7 100644 --- a/.github/workflows/sync-upstream.yml +++ b/.github/workflows/sync-upstream.yml @@ -2,7 +2,7 @@ name: Sync latest upstream master into local master on: schedule: - - cron: "0 5 * * *" + - cron: "42 13 * * *" workflow_dispatch: jobs: From e85d97b7b1e721dba049ada0aad92b8b4a83951a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 13:42:26 +0000 Subject: [PATCH 014/338] chore: maybe cron expressions are not in utc Co-authored-by: Markus Wolf --- .github/workflows/sync-upstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml index e5a459deeb7..ead2b529cf4 100644 --- a/.github/workflows/sync-upstream.yml +++ b/.github/workflows/sync-upstream.yml @@ -2,7 +2,7 @@ name: Sync latest upstream master into local master on: schedule: - - cron: "42 13 * * *" + - cron: "44 14 * * *" workflow_dispatch: jobs: From 88cbef9fbf427d286aec9da2fa3bf885352e9e24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 14:47:23 +0100 Subject: [PATCH 015/338] chore: set sync job to 5am utc again --- .github/workflows/sync-upstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml index ead2b529cf4..074e94fc4e5 100644 --- a/.github/workflows/sync-upstream.yml +++ b/.github/workflows/sync-upstream.yml @@ -2,7 +2,7 @@ name: Sync latest upstream master into local master on: schedule: - - cron: "44 14 * * *" + - cron: "0 5 * * *" workflow_dispatch: jobs: From db53419313cd89804b05bfda757781967c4d4d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 13:56:04 +0000 Subject: [PATCH 016/338] chore: add upstream via https url Co-authored-by: Markus Wolf --- .github/workflows/sync-upstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml index 074e94fc4e5..7b538cc37e0 100644 --- a/.github/workflows/sync-upstream.yml +++ b/.github/workflows/sync-upstream.yml @@ -13,7 +13,7 @@ jobs: with: ref: master - run: | - git remote add upstream git@github.com:nektos/act.git + git remote add upstream https://github.com/nektos/act.git git fetch upstream git reset --hard upstream/master git push --force origin master From ee2116fe9cdc09f726fde92a73185dc77ee0abbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 13:57:03 +0000 Subject: [PATCH 017/338] chore: build-with-patches workflow should use distribution ref Co-authored-by: Markus Wolf --- .github/workflows/build-with-patches.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index bb9e3499584..413b3882e0e 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -16,6 +16,7 @@ jobs: with: fetch-depth: 0 submodules: true + ref: distribution - id: release-tag name: compute release tag run: | @@ -39,6 +40,7 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + ref: distribution - name: setup git run: | git config --global user.name github-actions @@ -58,6 +60,7 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + ref: distribution - name: setup git run: | git config --global user.name github-actions @@ -84,6 +87,7 @@ jobs: with: fetch-depth: 0 submodules: true + ref: distribution - name: create release tag run: | git config --global user.name github-actions From 0a75cb82ae211c7e15e4d0fdc9f86edb2d10c5f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 14:09:14 +0000 Subject: [PATCH 018/338] chore: sync submodules from xing/act Co-authored-by: Markus Wolf --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 45d32f2d08d..c5a5040643f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "act"] path = act - url = https://github.com/nektos/act + url = https://github.com/xing/act.git From a42a8cda2d55534dede901f0a35e3dc2faba1d9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 14:09:35 +0000 Subject: [PATCH 019/338] chore: push patched master branch after tagging a release Co-authored-by: Markus Wolf --- .github/workflows/build-with-patches.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index 413b3882e0e..610c4d70f04 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -110,3 +110,7 @@ jobs: args: release --rm-dist env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: update patched-master branch + run: | + cd act + git push --force origin patched-master From 56c619065faa4bf3bb72b066ba4cf88ca9d70e82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 14:36:41 +0000 Subject: [PATCH 020/338] chore: create annotated tags to get correct sort order of releases Co-authored-by: Markus Wolf --- .github/workflows/build-with-patches.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index 610c4d70f04..8ee309e6f3c 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -96,9 +96,9 @@ jobs: # tag version in submodule and parent cd act - git tag "${{ needs.calculate-tag.outputs.tag }}" + git tag -m "${{ needs.calculate-tag.outputs.tag }}" "${{ needs.calculate-tag.outputs.tag }}" cd .. - git tag "${{ needs.calculate-tag.outputs.tag }}" + git tag -m "${{ needs.calculate-tag.outputs.tag }}" "${{ needs.calculate-tag.outputs.tag }}" - uses: actions/setup-go@v2 with: go-version: ${{ env.GO_VERSION }} From 57b7feb4498f0b626507f1279b45489604fea910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 14:41:59 +0000 Subject: [PATCH 021/338] chore: delete remote tag before release to ensure correct latest Co-authored-by: Markus Wolf --- .github/workflows/build-with-patches.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index 8ee309e6f3c..1ba19d6fe8e 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -95,6 +95,7 @@ jobs: make patch # tag version in submodule and parent + git push origin --delete "${{ needs.calculate-tag.outputs.tag }}" || true cd act git tag -m "${{ needs.calculate-tag.outputs.tag }}" "${{ needs.calculate-tag.outputs.tag }}" cd .. From ceba97c81809d4b7d3d9a73e6cd0f5b783edf3d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 14:59:22 +0000 Subject: [PATCH 022/338] chore: checkout patched-master branch before pushing it Co-authored-by: Markus Wolf --- .github/workflows/build-with-patches.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index 1ba19d6fe8e..2796c4393f8 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -114,4 +114,5 @@ jobs: - name: update patched-master branch run: | cd act + git checkout -b patched-master git push --force origin patched-master From f3ab179ab7669af7d6ac10c4150b4afa877f4102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 15:05:48 +0000 Subject: [PATCH 023/338] chore: ensure make clean correctly resets the submodule Co-authored-by: Markus Wolf --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f4490401cbf..84e798f7c21 100644 --- a/Makefile +++ b/Makefile @@ -12,4 +12,4 @@ act-test: patch .PHONE: clean clean: - git submodule foreach git reset --hard origin/master + git submodule update --init --force --checkout From ef0c11312aeabc8b2a9ffabac4cb02e96226ba50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 15:23:32 +0000 Subject: [PATCH 024/338] fix: re-create PR for uses-in-composite feature Co-authored-by: Markus Wolf --- patches | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches b/patches index 002f0d21c34..dc325506bba 100644 --- a/patches +++ b/patches @@ -13,4 +13,4 @@ https://github.com/nektos/act/pull/889.patch # fix: continue jobs + steps after failure https://github.com/nektos/act/pull/840.patch # Feature: uses in composite -https://github.com/xing/act/pull/26.patch \ No newline at end of file +https://github.com/xing/act/pull/27.patch From f32f05b9f041eacacd25ddf024d57dd3979d491b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 15:33:36 +0000 Subject: [PATCH 025/338] chore: use stable patch url with parent commit hash Co-authored-by: Markus Wolf --- patches | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches b/patches index dc325506bba..3dac5109026 100644 --- a/patches +++ b/patches @@ -12,5 +12,5 @@ https://github.com/nektos/act/pull/891.patch https://github.com/nektos/act/pull/889.patch # fix: continue jobs + steps after failure https://github.com/nektos/act/pull/840.patch -# Feature: uses in composite -https://github.com/xing/act/pull/27.patch +# Feature: uses in composite from branch "feature/uses-in-composite" +https://github.com/xing/act/compare/c990d0216b19a4dac0e62057909db52f073f9c2f...3729f3c0340d799f4bf5e34c2136f03fd8e57b2c.patch From fb13776d9cfff2e8898596ac15d83ccb6b278f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 15:41:02 +0000 Subject: [PATCH 026/338] chore: create and push tags only inside the submodule Co-authored-by: Markus Wolf --- .github/workflows/build-with-patches.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index 2796c4393f8..6bb5d7812cb 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -95,11 +95,10 @@ jobs: make patch # tag version in submodule and parent - git push origin --delete "${{ needs.calculate-tag.outputs.tag }}" || true cd act + git push origin --delete "${{ needs.calculate-tag.outputs.tag }}" || true git tag -m "${{ needs.calculate-tag.outputs.tag }}" "${{ needs.calculate-tag.outputs.tag }}" - cd .. - git tag -m "${{ needs.calculate-tag.outputs.tag }}" "${{ needs.calculate-tag.outputs.tag }}" + git push --tags - uses: actions/setup-go@v2 with: go-version: ${{ env.GO_VERSION }} From 59ee982a7c087a0b39768050f53363f1c2c9e545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 15:49:49 +0000 Subject: [PATCH 027/338] chore: delete local tag before re-creating it Co-authored-by: Markus Wolf --- .github/workflows/build-with-patches.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index 6bb5d7812cb..4234bc70a32 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -96,6 +96,7 @@ jobs: # tag version in submodule and parent cd act + git tag -d "${{ needs.calculate-tag.outputs.tag }}" || true git push origin --delete "${{ needs.calculate-tag.outputs.tag }}" || true git tag -m "${{ needs.calculate-tag.outputs.tag }}" "${{ needs.calculate-tag.outputs.tag }}" git push --tags From 97e996602d8d27e991940d9a0ca25d9cfdd23195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 16:03:09 +0000 Subject: [PATCH 028/338] chore: create tags only on superproject becuse goreleaser reads it Co-authored-by: Markus Wolf --- .github/workflows/build-with-patches.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index 4234bc70a32..93445fc00ac 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -94,8 +94,7 @@ jobs: git config --global user.email github-actions@github.com make patch - # tag version in submodule and parent - cd act + # tag version git tag -d "${{ needs.calculate-tag.outputs.tag }}" || true git push origin --delete "${{ needs.calculate-tag.outputs.tag }}" || true git tag -m "${{ needs.calculate-tag.outputs.tag }}" "${{ needs.calculate-tag.outputs.tag }}" From 32482c95dde0c3e2af2225c3d03c7292c5010a6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 16:17:31 +0000 Subject: [PATCH 029/338] chore: we need to tag both the superproject and the submodule Co-authored-by: Markus Wolf --- .github/workflows/build-with-patches.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index 93445fc00ac..d6fb9c18138 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -27,7 +27,7 @@ jobs: echo ::set-output name=tag::${tag} latest="$(curl -fsSLI -o /dev/null -w "%{url_effective}" https://github.com/xing/act/releases/latest)" - latest="${latest#https://github.com/xing/act/releases/tag/}" + latest="${latest#https://github.com/xing/act/releases/tag/}" echo ::set-output name=latest::${latest} echo "tag: ${tag} latest: ${latest}" @@ -94,11 +94,15 @@ jobs: git config --global user.email github-actions@github.com make patch - # tag version + # tag version on the superproject because the goreleaser action reads it git tag -d "${{ needs.calculate-tag.outputs.tag }}" || true git push origin --delete "${{ needs.calculate-tag.outputs.tag }}" || true + # push an annotated tag to have latest release sorted by taggerdate git tag -m "${{ needs.calculate-tag.outputs.tag }}" "${{ needs.calculate-tag.outputs.tag }}" git push --tags + # tag version in the submodule because goreleaser verifies that the tag is set on the current commit + cd act + git tag "${{ needs.calculate-tag.outputs.tag }}" - uses: actions/setup-go@v2 with: go-version: ${{ env.GO_VERSION }} From 4fff07890d6ae834459efb8d46dbb38f8261d852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 23 Nov 2021 16:30:49 +0000 Subject: [PATCH 030/338] chore: delete local tag before tagging the submodule Co-authored-by: Markus Wolf --- .github/workflows/build-with-patches.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index d6fb9c18138..543a0ecb8c5 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -102,6 +102,7 @@ jobs: git push --tags # tag version in the submodule because goreleaser verifies that the tag is set on the current commit cd act + git tag -d "${{ needs.calculate-tag.outputs.tag }}" || true git tag "${{ needs.calculate-tag.outputs.tag }}" - uses: actions/setup-go@v2 with: From ca8b640ce3be03ec0300e406c4794ee4762b5722 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Tue, 23 Nov 2021 18:05:56 +0100 Subject: [PATCH 031/338] chore: force update version hash --- version-hash.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/version-hash.sh b/version-hash.sh index a49a92db126..6d2d3328143 100755 --- a/version-hash.sh +++ b/version-hash.sh @@ -7,6 +7,9 @@ cd act || exit 1 temp=$(mktemp -d -t act-patches-XXXXXXXXXX) +# just test +echo 0 > "$temp/counter" + git describe --tags --dirty --always > "$temp/upstream" grep -v '^#' < ../patches | while IFS= read -r patch From 6c75b5ebc6ce9541b7f8be254d2ca1e8155a6b4c Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Tue, 23 Nov 2021 18:29:56 +0100 Subject: [PATCH 032/338] chore: increase version hash counter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Björn Brauer --- version-hash.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version-hash.sh b/version-hash.sh index 6d2d3328143..58f3af03531 100755 --- a/version-hash.sh +++ b/version-hash.sh @@ -8,7 +8,7 @@ cd act || exit 1 temp=$(mktemp -d -t act-patches-XXXXXXXXXX) # just test -echo 0 > "$temp/counter" +echo 1 > "$temp/counter" git describe --tags --dirty --always > "$temp/upstream" From 93cbe262f0f2bdd44a2a6cdc9730ad428fd5c411 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Tue, 23 Nov 2021 18:40:07 +0100 Subject: [PATCH 033/338] chore: remove version hash counter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Björn Brauer --- version-hash.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/version-hash.sh b/version-hash.sh index 58f3af03531..a49a92db126 100755 --- a/version-hash.sh +++ b/version-hash.sh @@ -7,9 +7,6 @@ cd act || exit 1 temp=$(mktemp -d -t act-patches-XXXXXXXXXX) -# just test -echo 1 > "$temp/counter" - git describe --tags --dirty --always > "$temp/upstream" grep -v '^#' < ../patches | while IFS= read -r patch From 165b625c5c60a1e6fbc0057ac2c65973e1ed5d40 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Tue, 23 Nov 2021 19:24:44 +0100 Subject: [PATCH 034/338] feat: reimplement commit tag calculation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Björn Brauer --- .github/workflows/build-with-patches.yml | 21 ++++++------------ compute-release-tag.sh | 27 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 15 deletions(-) create mode 100755 compute-release-tag.sh diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index 543a0ecb8c5..96bba546a02 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -9,8 +9,9 @@ jobs: calculate-tag: runs-on: ubuntu-latest outputs: + versionHash: ${{ steps.release-tag.outputs.versionHash }} + latestHash: ${{ steps.release-tag.outputs.latestHash }} tag: ${{ steps.release-tag.outputs.tag }} - latest: ${{ steps.release-tag.outputs.latest }} steps: - uses: actions/checkout@v2 with: @@ -20,22 +21,12 @@ jobs: - id: release-tag name: compute release tag run: | - version=$(cd act && git describe --tags --dirty --always |cut -d "-" -f 1) - hash=$(./version-hash.sh) - - tag="${version}-${hash}" - echo ::set-output name=tag::${tag} - - latest="$(curl -fsSLI -o /dev/null -w "%{url_effective}" https://github.com/xing/act/releases/latest)" - latest="${latest#https://github.com/xing/act/releases/tag/}" - echo ::set-output name=latest::${latest} - - echo "tag: ${tag} latest: ${latest}" + ./compute-release-tag.sh build: runs-on: ubuntu-latest needs: [calculate-tag] - if: needs.calculate-tag.outputs.tag != needs.calculate-tag.outputs.latest + if: needs.calculate-tag.outputs.versionHash != needs.calculate-tag.outputs.latestHash steps: - uses: actions/checkout@v2 with: @@ -55,7 +46,7 @@ jobs: test: runs-on: ubuntu-latest needs: [calculate-tag] - if: needs.calculate-tag.outputs.tag != needs.calculate-tag.outputs.latest + if: needs.calculate-tag.outputs.versionHash != needs.calculate-tag.outputs.latestHash steps: - uses: actions/checkout@v2 with: @@ -81,7 +72,7 @@ jobs: tag-release: runs-on: ubuntu-latest needs: ["calculate-tag", "build", "test"] - if: github.ref == 'refs/heads/distribution' && needs.calculate-tag.outputs.tag != needs.calculate-tag.outputs.latest + if: github.ref == 'refs/heads/distribution' && needs.calculate-tag.outputs.versionHash != needs.calculate-tag.outputs.latestHash steps: - uses: actions/checkout@v2 with: diff --git a/compute-release-tag.sh b/compute-release-tag.sh new file mode 100755 index 00000000000..591c3f564c9 --- /dev/null +++ b/compute-release-tag.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +set -euo pipefail + +version=$(cd act && git describe --tags --dirty --always |cut -d "-" -f 1) +hash=$(./version-hash.sh) +versionHash=${version}-${hash} +echo "::set-output name=versionHash::${versionHash}" + +gitTag=$(git for-each-ref --sort=taggerdate --format '%(tag)' refs/tags |tail -1) +# shellcheck disable=SC2001 +counter=$(echo "${gitTag}" |sed -e 's/.*-xing\.\([[:digit:]]\+\)-.*/\1/') +if [ "${gitTag}" = "${counter}" ] ; then + counter="0" +else + counter=$(("${counter}" + 1)) +fi +tag="${version}-xing.${counter}-${hash}" +echo "::set-output name=tag::${tag}" + +latestHash="$(curl -fsSLI -o /dev/null -w "%{url_effective}" https://github.com/xing/act/releases/latest)" +latestHash="${latestHash#https://github.com/xing/act/releases/tag/}" +# shellcheck disable=SC2001 +latestHash=$(echo "${latestHash}" |sed -e 's/-xing\.[[:digit:]]\+//') +echo "::set-output name=latestHash::${latestHash}" + +echo "versionHash: ${versionHash} tag: ${tag} latestHash: ${latestHash}" From ce74263b9ebd9e855687ef2d0ebd0c69a665e697 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Wed, 24 Nov 2021 16:01:06 +0100 Subject: [PATCH 035/338] chore: run on event branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Björn Brauer --- .github/workflows/build-with-patches.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index 96bba546a02..fe0c1e8a546 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -17,7 +17,6 @@ jobs: with: fetch-depth: 0 submodules: true - ref: distribution - id: release-tag name: compute release tag run: | @@ -31,7 +30,6 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - ref: distribution - name: setup git run: | git config --global user.name github-actions @@ -51,7 +49,6 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - ref: distribution - name: setup git run: | git config --global user.name github-actions @@ -78,7 +75,6 @@ jobs: with: fetch-depth: 0 submodules: true - ref: distribution - name: create release tag run: | git config --global user.name github-actions From 194a72785d6b372faa355573f55737778f962579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Wed, 24 Nov 2021 15:48:57 +0000 Subject: [PATCH 036/338] docs: add README describing what this is for and how to use it Co-authored-by: Markus Wolf --- README.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000000..0949582bf04 --- /dev/null +++ b/README.md @@ -0,0 +1,45 @@ +# XING `act` fork with patches applied + +This repository is a fork of `nektos/act` with a few changes: +- The `master` branch is automatically updated with the latest changes from `nektos/act` [workflow](https://github.com/xing/act/actions/workflows/sync-upstream.yml) +- We have an orphan branch called `distribution`, which contains the patches and our workflows to sync the `master` branch and apply the patches +- We push the patched master branch as `patched-master` +- We publish a new release each time something changes (upstream `master` is updated or patches are updated) + +## Development workflow + +We have two different types of patches: +- "forever downstream" patches, so that we can deploy as `xing/act` and which will never be upstreamed +- "temporary" patches, which are PRs open on `nektos/act` that we expect to be merged soon + +### Creating "forever downstream" patches + +In order to patch something that will never get upstreamed, we need to branch off of `master` and push the changes as `patch/`. +We then create a draft PR against the `master` branch on `xing/act` to get the patch URL. + +Next we branch off of `distribution` and add the URL of the previously created PR to the `patches` file and create a PR against the `distribution` branch on `xing/act`. +This PR will try to apply all patches and run the tests. Once it succeeds, we can merge it so that the `patches` file on `distribution` contains all required patches. + +### Creating "temporary" patches + +#### Creating a patch for our own PRs (trusted) + +We branch off of `distribution` and add the URL of our PR to the `patches` file and create a PR against the `distribution` branch on `xing/act`. +This PR will try to apply all patches and run the tests. Once it succeeds, we can merge it so that the `patches` file on `distribution` contains all required patches. + +In case merge conflicts arise, restart and follow the instructions for untrusted PRs. + + +#### Creating a patch for other PRs (untrusted) + +> Important to note here: We need to thoroughly review the code that we merge in here, because it gets built automatically and is then being used in the act-app. + +In order to create a patch for untrusted PRs we need to branch off of `patched-master` and squash merge the changes into our newly created branch. +All potential conflicts need to be resolved, so that the resulting patch can apply cleanly. + +Next we need to push the changes to `xing/act` and create a patch using the compare URL with the start/end commit SHAs. +Example: `https://github.com/xing/act/compare/....patch` + +This patch URL can now be added to the `patches` file as described for trusted PRs. + +Since we are "pinning" the PR changes to commit SHAs that exist in `xing/act` we need to repeat the above process if the upstream PR gets updated. From c53fe0bd320ce9e6a1f97d828ffceff01c4f024f Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Thu, 25 Nov 2021 10:44:24 +0100 Subject: [PATCH 037/338] chore: Makefile requires tabs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Björn Brauer --- .editorconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.editorconfig b/.editorconfig index 0eef8b2bd9c..9dfb2845632 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,3 +10,6 @@ trim_trailing_whitespace = false [*.yml] trim_trailing_whitespace = false + +[Makefile] +indent_style = tab From 2b894d275be79bf558a65e2b65e351e87922866a Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Thu, 25 Nov 2021 10:44:39 +0100 Subject: [PATCH 038/338] feat: add target to update act (submodule) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Björn Brauer --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 84e798f7c21..ee052536d46 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,10 @@ act-build: patch act-test: patch cd act && go test -v ./... -.PHONE: clean +.PHONY: clean clean: git submodule update --init --force --checkout + +.PHONY: update-act +update-act: + git submodule foreach git pull origin master From 86e7256bf0444759c7d1c5949e46151254f263ac Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Thu, 25 Nov 2021 10:45:31 +0100 Subject: [PATCH 039/338] chore: update act to v0.2.25 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Björn Brauer --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 96cf907c5e1..6ebcac37710 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 96cf907c5e1f4761ef6d91bb8e22487747a77f6b +Subproject commit 6ebcac37710ae5d4eb87f63f31d7e1be8fe3d217 From baf6b0e21474418c0f1ae29a48fa3174774251bf Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Thu, 25 Nov 2021 10:55:00 +0100 Subject: [PATCH 040/338] chore: reset on clean MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Björn Brauer --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index ee052536d46..766d7634efe 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ act-test: patch .PHONY: clean clean: + git submodule foreach 'git am --abort || true' git submodule update --init --force --checkout .PHONY: update-act From 9f1e84cc8dd3223016d9a04973feb34ec8a8bd04 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Thu, 25 Nov 2021 11:03:14 +0100 Subject: [PATCH 041/338] chore: update distribution and create release on master update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Björn Brauer --- .github/workflows/sync-upstream.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml index 7b538cc37e0..c2dbb509c98 100644 --- a/.github/workflows/sync-upstream.yml +++ b/.github/workflows/sync-upstream.yml @@ -16,4 +16,12 @@ jobs: git remote add upstream https://github.com/nektos/act.git git fetch upstream git reset --hard upstream/master - git push --force origin master + git push --follow-tags --force origin master + - uses: actions/checkout@v2 + with: + ref: distribution + submodules: true + - run: | + make update-act + git commit -a -m "chore: update act (submodule)" + git push origin distribution From 3502720a551c108d60fae048db731b22a264c920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Thu, 25 Nov 2021 10:36:56 +0000 Subject: [PATCH 042/338] chore: use a custom app token to be able to trigger other workflows Co-authored-by: Markus Wolf --- .github/workflows/sync-upstream.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml index c2dbb509c98..e5399e7d507 100644 --- a/.github/workflows/sync-upstream.yml +++ b/.github/workflows/sync-upstream.yml @@ -17,10 +17,18 @@ jobs: git fetch upstream git reset --hard upstream/master git push --follow-tags --force origin master + - name: Get Token + id: get_workflow_token + uses: xing/workflow-application-token-action@main + with: + application_id: ${{ secrets.XING_ACTIONS_APP_ID }} + application_private_key: ${{ secrets.XING_ACTIONS_PRIVATE_KEY }} + permissions: "contents:write" - uses: actions/checkout@v2 with: ref: distribution submodules: true + token: ${{ steps.get_workflow_token.outputs.token }} - run: | make update-act git commit -a -m "chore: update act (submodule)" From c45dfc54fe8b31a819687bee222382274f55f9cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Thu, 25 Nov 2021 10:42:41 +0000 Subject: [PATCH 043/338] chore: set git author Co-authored-by: Markus Wolf --- .github/workflows/sync-upstream.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml index e5399e7d507..c85b928dead 100644 --- a/.github/workflows/sync-upstream.yml +++ b/.github/workflows/sync-upstream.yml @@ -30,6 +30,8 @@ jobs: submodules: true token: ${{ steps.get_workflow_token.outputs.token }} - run: | + git config user.name github-actions + git config user.email github-actions@github.com make update-act git commit -a -m "chore: update act (submodule)" git push origin distribution From 32839fa6da2f5962d1ecdeecf27271bbbca7fd74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Thu, 25 Nov 2021 10:44:28 +0000 Subject: [PATCH 044/338] chore: only push updated submodule if the commit succeeded Co-authored-by: Markus Wolf --- .github/workflows/sync-upstream.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml index c85b928dead..eb98be9c8cc 100644 --- a/.github/workflows/sync-upstream.yml +++ b/.github/workflows/sync-upstream.yml @@ -33,5 +33,4 @@ jobs: git config user.name github-actions git config user.email github-actions@github.com make update-act - git commit -a -m "chore: update act (submodule)" - git push origin distribution + (git commit -a -m "chore: update act (submodule)" && git push origin distribution) || true From 5ee07896fec62edfcb79f32243aa642f3444b124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Thu, 25 Nov 2021 10:52:28 +0000 Subject: [PATCH 045/338] chore: only commit and push if there are changes Co-authored-by: Markus Wolf --- .github/workflows/sync-upstream.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml index eb98be9c8cc..b0c83ddee27 100644 --- a/.github/workflows/sync-upstream.yml +++ b/.github/workflows/sync-upstream.yml @@ -33,4 +33,7 @@ jobs: git config user.name github-actions git config user.email github-actions@github.com make update-act - (git commit -a -m "chore: update act (submodule)" && git push origin distribution) || true + if git status --porcelain | grep 'M act' >/dev/null; then + git commit -a -m "chore: update act (submodule)" + git push origin distribution + fi From d1c9fc06d737487bd16b1d438dda0fd52d7aa4a5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 27 Nov 2021 05:04:21 +0000 Subject: [PATCH 046/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 6ebcac37710..f7263399b91 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 6ebcac37710ae5d4eb87f63f31d7e1be8fe3d217 +Subproject commit f7263399b9146a43b988e011d986d18d180414d2 From b7fae32f52df7da80ed1a40183100294d4a12314 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 28 Nov 2021 05:04:21 +0000 Subject: [PATCH 047/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index f7263399b91..b910a42edfa 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit f7263399b9146a43b988e011d986d18d180414d2 +Subproject commit b910a42edfab7a02b08a52ecef203fd419725642 From 78d9d9087789a9f17883bed30d41ec8fccfe30d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 30 Nov 2021 12:46:32 +0000 Subject: [PATCH 048/338] chore: remove upstreamed patches * https://github.com/nektos/act/pull/898 * https://github.com/nektos/act/pull/891 have both been merged upstream, so they're no longer required here. --- patches | 4 ---- 1 file changed, 4 deletions(-) diff --git a/patches b/patches index 3dac5109026..2166f5e8852 100644 --- a/patches +++ b/patches @@ -4,10 +4,6 @@ https://github.com/xing/act/pull/23.patch # customize goreleaser configuration https://github.com/xing/act/pull/22.patch # ------------------------------------------- -# feat: allow existing logger from context -https://github.com/nektos/act/pull/898.patch -# feat: read docker credentials from local docker config -https://github.com/nektos/act/pull/891.patch # feat: try to read ref and sha from event payload if available https://github.com/nektos/act/pull/889.patch # fix: continue jobs + steps after failure From 4e18636d987193a00e0f8c6ddb6b88d90ffde687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 30 Nov 2021 13:23:36 +0000 Subject: [PATCH 049/338] fix: resolve conflicts in feature/uses-in-composite patch --- patches | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches b/patches index 2166f5e8852..4b41a87d802 100644 --- a/patches +++ b/patches @@ -9,4 +9,4 @@ https://github.com/nektos/act/pull/889.patch # fix: continue jobs + steps after failure https://github.com/nektos/act/pull/840.patch # Feature: uses in composite from branch "feature/uses-in-composite" -https://github.com/xing/act/compare/c990d0216b19a4dac0e62057909db52f073f9c2f...3729f3c0340d799f4bf5e34c2136f03fd8e57b2c.patch +https://github.com/xing/act/compare/5f7bcf4b167cb0832c566c14495dcc7cb6eb3f1a...55e71c9dec2de7f6210a5074918e8287bccfcb9b.patch From 7a95c8592f50546bf0b9e386d50624be15175e70 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Tue, 30 Nov 2021 17:33:34 +0100 Subject: [PATCH 050/338] patch: add fix for continue after failure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Björn Brauer --- patches | 1 + 1 file changed, 1 insertion(+) diff --git a/patches b/patches index 4b41a87d802..a7306a043b9 100644 --- a/patches +++ b/patches @@ -10,3 +10,4 @@ https://github.com/nektos/act/pull/889.patch https://github.com/nektos/act/pull/840.patch # Feature: uses in composite from branch "feature/uses-in-composite" https://github.com/xing/act/compare/5f7bcf4b167cb0832c566c14495dcc7cb6eb3f1a...55e71c9dec2de7f6210a5074918e8287bccfcb9b.patch +https://github.com/xing/act/compare/e1dc5f74dbd17a789ab510e5b06a14f1f6252911...ef228c0d936e6cdb5ae0175e0167fa94b32681ba.patch From 5e02fda5a3a341d2e3742036a32a843648358637 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Fri, 3 Dec 2021 11:15:05 +0100 Subject: [PATCH 051/338] feat: add patch for log boundaries Co-authored-by: Philipp Hinrichsen --- patches | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches b/patches index a7306a043b9..f4a190f253b 100644 --- a/patches +++ b/patches @@ -4,6 +4,8 @@ https://github.com/xing/act/pull/23.patch # customize goreleaser configuration https://github.com/xing/act/pull/22.patch # ------------------------------------------- +# feat: print plan summary upfront to executing it +https://github.com/nektos/act/pull/913.patch # feat: try to read ref and sha from event payload if available https://github.com/nektos/act/pull/889.patch # fix: continue jobs + steps after failure From 5ab4c01f938f3e4ed7c5f69eb4ba18bbb6b7f823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Mon, 6 Dec 2021 14:19:06 +0000 Subject: [PATCH 052/338] chore: switch to our own pr on xing/act for print-plan patch Co-authored-by: Markus Wolf Co-authored-by: Philipp Hinrichsen --- patches | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches b/patches index f4a190f253b..2105451e235 100644 --- a/patches +++ b/patches @@ -3,9 +3,9 @@ https://github.com/xing/act/pull/23.patch # customize goreleaser configuration https://github.com/xing/act/pull/22.patch -# ------------------------------------------- # feat: print plan summary upfront to executing it -https://github.com/nektos/act/pull/913.patch +https://github.com/xing/act/pull/34.patch +# ------------------------------------------- # feat: try to read ref and sha from event payload if available https://github.com/nektos/act/pull/889.patch # fix: continue jobs + steps after failure From 8151ea86afbad93d85eaa9ebc1fa592b71ff29da Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 9 Dec 2021 05:04:41 +0000 Subject: [PATCH 053/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index b910a42edfa..1891c72ab15 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit b910a42edfab7a02b08a52ecef203fd419725642 +Subproject commit 1891c72ab158508e36009d16b24913fa5836422b From 3b271c3604956f1e4880530e074794bb8caf24a1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 9 Dec 2021 17:24:15 +0000 Subject: [PATCH 054/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 1891c72ab15..fec0c0c529f 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 1891c72ab158508e36009d16b24913fa5836422b +Subproject commit fec0c0c529f5510464c858ff9a6664e0647245a8 From c3dd78931e02d4b65b9d9626cdd078304b0d0e8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Thu, 9 Dec 2021 17:30:00 +0000 Subject: [PATCH 055/338] chore: remove merged upstream patch for job status functions --- patches | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches b/patches index 2105451e235..0f2f90fbe46 100644 --- a/patches +++ b/patches @@ -8,8 +8,6 @@ https://github.com/xing/act/pull/34.patch # ------------------------------------------- # feat: try to read ref and sha from event payload if available https://github.com/nektos/act/pull/889.patch -# fix: continue jobs + steps after failure -https://github.com/nektos/act/pull/840.patch # Feature: uses in composite from branch "feature/uses-in-composite" https://github.com/xing/act/compare/5f7bcf4b167cb0832c566c14495dcc7cb6eb3f1a...55e71c9dec2de7f6210a5074918e8287bccfcb9b.patch https://github.com/xing/act/compare/e1dc5f74dbd17a789ab510e5b06a14f1f6252911...ef228c0d936e6cdb5ae0175e0167fa94b32681ba.patch From 21bc4a407fd35456955f21f663aa078ea6b59a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Thu, 9 Dec 2021 17:38:03 +0000 Subject: [PATCH 056/338] chore: update uses-in-composite patch url --- patches | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/patches b/patches index 0f2f90fbe46..6a81ed37d48 100644 --- a/patches +++ b/patches @@ -9,5 +9,4 @@ https://github.com/xing/act/pull/34.patch # feat: try to read ref and sha from event payload if available https://github.com/nektos/act/pull/889.patch # Feature: uses in composite from branch "feature/uses-in-composite" -https://github.com/xing/act/compare/5f7bcf4b167cb0832c566c14495dcc7cb6eb3f1a...55e71c9dec2de7f6210a5074918e8287bccfcb9b.patch -https://github.com/xing/act/compare/e1dc5f74dbd17a789ab510e5b06a14f1f6252911...ef228c0d936e6cdb5ae0175e0167fa94b32681ba.patch +https://github.com/xing/act/compare/93149e5b3f18d6ccfab90651c99aee80df9cd89e...9ce22852eb10a2d291098735a77e909db4c22f41.patch From f5565c48e55da06952dad81c3398f4b4418579f5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 12 Dec 2021 05:04:30 +0000 Subject: [PATCH 057/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index fec0c0c529f..cad4bc8c367 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit fec0c0c529f5510464c858ff9a6664e0647245a8 +Subproject commit cad4bc8c367fd4e623dfe2820bd5f3daca80bf58 From 208249be5274ec78eb2a5bb81ca3741ee4664211 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 17 Dec 2021 05:05:09 +0000 Subject: [PATCH 058/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index cad4bc8c367..4e0ba618d34 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit cad4bc8c367fd4e623dfe2820bd5f3daca80bf58 +Subproject commit 4e0ba618d34a198fa30904b1bf8549010513a931 From 93667fa94d35997496edcf53e7d1d20ce227a52d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Mon, 3 Jan 2022 12:34:48 +0000 Subject: [PATCH 059/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 4e0ba618d34..4e6cddf80a7 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 4e0ba618d34a198fa30904b1bf8549010513a931 +Subproject commit 4e6cddf80a712469695640058bcfceee7adaeda6 From ec2759ed99be312cb4edb43c75eaaadf47687425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Mon, 3 Jan 2022 12:43:22 +0000 Subject: [PATCH 060/338] chore: remove uses-in-composite patch --- patches | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches b/patches index 6a81ed37d48..96b684bdbb3 100644 --- a/patches +++ b/patches @@ -8,5 +8,3 @@ https://github.com/xing/act/pull/34.patch # ------------------------------------------- # feat: try to read ref and sha from event payload if available https://github.com/nektos/act/pull/889.patch -# Feature: uses in composite from branch "feature/uses-in-composite" -https://github.com/xing/act/compare/93149e5b3f18d6ccfab90651c99aee80df9cd89e...9ce22852eb10a2d291098735a77e909db4c22f41.patch From de5083341d01127d6f9f4ad539b4dd8956c934ec Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Tue, 4 Jan 2022 19:02:30 +0100 Subject: [PATCH 061/338] chore: add patch for skipped step output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Björn Brauer --- patches | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches b/patches index 96b684bdbb3..5be900b6046 100644 --- a/patches +++ b/patches @@ -8,3 +8,5 @@ https://github.com/xing/act/pull/34.patch # ------------------------------------------- # feat: try to read ref and sha from event payload if available https://github.com/nektos/act/pull/889.patch +# fix: set composite outputs on failure +https://github.com/nektos/act/pull/950.patch From 0c5eeb21854660193858f5f05280a35e94b20b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Wed, 5 Jan 2022 13:35:07 +0000 Subject: [PATCH 062/338] chore: add patch to revert concurrency limit --- patches | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches b/patches index 5be900b6046..5cff3be4fc9 100644 --- a/patches +++ b/patches @@ -5,6 +5,8 @@ https://github.com/xing/act/pull/23.patch https://github.com/xing/act/pull/22.patch # feat: print plan summary upfront to executing it https://github.com/xing/act/pull/34.patch +# Revert "fix: add simple concurrency limit (#823)" +https://github.com/xing/act/pull/36.patch # ------------------------------------------- # feat: try to read ref and sha from event payload if available https://github.com/nektos/act/pull/889.patch From d4e602ae47ff2ed44846af4cca01072b4b809351 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Mon, 10 Jan 2022 09:05:42 +0100 Subject: [PATCH 063/338] docs: add status badges --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 0949582bf04..0f34df1a034 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,12 @@ This repository is a fork of `nektos/act` with a few changes: - We push the patched master branch as `patched-master` - We publish a new release each time something changes (upstream `master` is updated or patches are updated) +## Status + +[![Synced with upstream](https://github.com/xing/act/actions/workflows/sync-upstream.yml/badge.svg)](https://github.com/xing/act/actions/workflows/sync-upstream.yml) +[![Build with patches](https://github.com/xing/act/actions/workflows/build-with-patches.yml/badge.svg)](https://github.com/xing/act/actions/workflows/build-with-patches.yml) + + ## Development workflow We have two different types of patches: From 999ea9477883a20f27b19a48d8f1e214f89bd496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Thu, 20 Jan 2022 14:22:40 +0000 Subject: [PATCH 064/338] feat: add patch to include gh-actions in isCheckout --- patches | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches b/patches index 5cff3be4fc9..c91f7d47637 100644 --- a/patches +++ b/patches @@ -5,6 +5,8 @@ https://github.com/xing/act/pull/23.patch https://github.com/xing/act/pull/22.patch # feat: print plan summary upfront to executing it https://github.com/xing/act/pull/34.patch +# check if org is actions/gh-actions for remoteAction.isCheckout +https://github.com/xing/act/pull/38.patch # Revert "fix: add simple concurrency limit (#823)" https://github.com/xing/act/pull/36.patch # ------------------------------------------- From 8a669b9ad808393e924d9f1c6474855eeb2ba7f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Thu, 20 Jan 2022 14:30:49 +0000 Subject: [PATCH 065/338] chore: correctly name patch --- patches | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches b/patches index c91f7d47637..3efb94174f8 100644 --- a/patches +++ b/patches @@ -12,5 +12,5 @@ https://github.com/xing/act/pull/36.patch # ------------------------------------------- # feat: try to read ref and sha from event payload if available https://github.com/nektos/act/pull/889.patch -# fix: set composite outputs on failure +# feat: add skipped status as step result https://github.com/nektos/act/pull/950.patch From ea059fd10458be3f7f8b408403783d0f3ef4cf10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Thu, 20 Jan 2022 14:59:19 +0000 Subject: [PATCH 066/338] feat: add patches for composite outputs, ssh agent and expr parser Co-authored-by: Markus Wolf --- patches | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/patches b/patches index 3efb94174f8..ef01f524156 100644 --- a/patches +++ b/patches @@ -14,3 +14,9 @@ https://github.com/xing/act/pull/36.patch https://github.com/nektos/act/pull/889.patch # feat: add skipped status as step result https://github.com/nektos/act/pull/950.patch +# fix: set composite outputs on failure +https://github.com/nektos/act/pull/945.patch +# SSH-agent authentication for cloning actions +https://github.com/nektos/act/pull/939.patch +# Refactor expression evaluator to use parser from actionlint package +https://github.com/nektos/act/pull/908.patch From a2979e57d581f29b062f3793f2c4b1a088422521 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 22 Jan 2022 05:04:32 +0000 Subject: [PATCH 067/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 4e6cddf80a7..2eda7c6037b 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 4e6cddf80a712469695640058bcfceee7adaeda6 +Subproject commit 2eda7c6037b921ae88742b2ff29b20bb171497a6 From d89954055dceb5ba5c983047a1d07603b3837e85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Mon, 24 Jan 2022 09:06:21 +0000 Subject: [PATCH 068/338] chore: remove merged patches --- patches | 8 -------- 1 file changed, 8 deletions(-) diff --git a/patches b/patches index ef01f524156..bbf301bdef1 100644 --- a/patches +++ b/patches @@ -10,13 +10,5 @@ https://github.com/xing/act/pull/38.patch # Revert "fix: add simple concurrency limit (#823)" https://github.com/xing/act/pull/36.patch # ------------------------------------------- -# feat: try to read ref and sha from event payload if available -https://github.com/nektos/act/pull/889.patch -# feat: add skipped status as step result -https://github.com/nektos/act/pull/950.patch -# fix: set composite outputs on failure -https://github.com/nektos/act/pull/945.patch # SSH-agent authentication for cloning actions https://github.com/nektos/act/pull/939.patch -# Refactor expression evaluator to use parser from actionlint package -https://github.com/nektos/act/pull/908.patch From d57dc9494b47cff36df743eef0e33d6be705b5a9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 26 Jan 2022 05:04:37 +0000 Subject: [PATCH 069/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 2eda7c6037b..3f0375aeff1 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 2eda7c6037b921ae88742b2ff29b20bb171497a6 +Subproject commit 3f0375aeff1973b674b33a0e4c44bc05a41714c5 From 1051b048a77d1ada7c51f63e8c14eeeba36d0cda Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 27 Jan 2022 05:04:43 +0000 Subject: [PATCH 070/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 3f0375aeff1..557dc755b8f 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 3f0375aeff1973b674b33a0e4c44bc05a41714c5 +Subproject commit 557dc755b8fe6b286d15bd7a1091f3731dc44791 From 0f58b2bf77c14c4ef37d45bf06f90b850869c18f Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 28 Jan 2022 05:04:34 +0000 Subject: [PATCH 071/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 557dc755b8f..4f8da0a51cd 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 557dc755b8fe6b286d15bd7a1091f3731dc44791 +Subproject commit 4f8da0a51cd44753f3e4ea0364877f6d2aa11f1d From d555577029f578d6be6c4f2db9a85785c369afdd Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 1 Feb 2022 05:04:38 +0000 Subject: [PATCH 072/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 4f8da0a51cd..b1f5963c862 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 4f8da0a51cd44753f3e4ea0364877f6d2aa11f1d +Subproject commit b1f5963c8623d5a5a92d2783b30da73c339232e2 From cb9484820ad7d9736761565ecebfe7ae3d55f907 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 9 Feb 2022 05:04:53 +0000 Subject: [PATCH 073/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index b1f5963c862..e4f0080a1ef 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit b1f5963c8623d5a5a92d2783b30da73c339232e2 +Subproject commit e4f0080a1efc9887fe8aa892669b2002e70b6040 From 53befd5b31cce09c7c6ab9549b8b827d18919f82 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Wed, 9 Feb 2022 09:51:00 +0100 Subject: [PATCH 074/338] fix: revert patch for local cloning Since we need to clone on the jenkins (this should match GitHub Actions behavior), we have to revert this patch. A better way to do this would be to make it configurable via the act configuration. Either in upstream (prefered) or as a local patch if not accepted upstream. --- patches | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches b/patches index bbf301bdef1..10b82e9ae9b 100644 --- a/patches +++ b/patches @@ -5,8 +5,6 @@ https://github.com/xing/act/pull/23.patch https://github.com/xing/act/pull/22.patch # feat: print plan summary upfront to executing it https://github.com/xing/act/pull/34.patch -# check if org is actions/gh-actions for remoteAction.isCheckout -https://github.com/xing/act/pull/38.patch # Revert "fix: add simple concurrency limit (#823)" https://github.com/xing/act/pull/36.patch # ------------------------------------------- From 9e9100a42ce4fce5a4c835462ef0cb38556a499f Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 11 Feb 2022 05:04:36 +0000 Subject: [PATCH 075/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index e4f0080a1ef..9abc87b4163 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit e4f0080a1efc9887fe8aa892669b2002e70b6040 +Subproject commit 9abc87b41634cab2ad9325287fbed9135c2664c4 From f22b40f99d5872fe5c5f8ef8fc52dc280df119e5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 12 Feb 2022 05:04:30 +0000 Subject: [PATCH 076/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 9abc87b4163..331afe170ab 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 9abc87b41634cab2ad9325287fbed9135c2664c4 +Subproject commit 331afe170abb9143bb0e9573a30ce5b75733315b From 87af95f2ffabd59b31ea59a8a286f6a0edc960aa Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 16 Feb 2022 05:04:31 +0000 Subject: [PATCH 077/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 331afe170ab..ff13844b864 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 331afe170abb9143bb0e9573a30ce5b75733315b +Subproject commit ff13844b8643abaff9daa47a5bc96aa91fddcf5e From 3dcd9b53e83f97c6a87ffb80188f86e576e4d5ab Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 26 Feb 2022 05:04:32 +0000 Subject: [PATCH 078/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index ff13844b864..18792f9620f 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit ff13844b8643abaff9daa47a5bc96aa91fddcf5e +Subproject commit 18792f9620fd2fd7dacc53ae30a234fbfc7c81b1 From 73bb9a42235f12386dc5e1b006de876b638b0aa5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 1 Mar 2022 05:06:10 +0000 Subject: [PATCH 079/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 18792f9620f..e9e6ddadf56 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 18792f9620fd2fd7dacc53ae30a234fbfc7c81b1 +Subproject commit e9e6ddadf567beb62ddb94b3fe472297081d4077 From 62ba18a892032ce91935284bf8d14a70f9c63838 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 3 Mar 2022 05:04:36 +0000 Subject: [PATCH 080/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index e9e6ddadf56..3db3c737230 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit e9e6ddadf567beb62ddb94b3fe472297081d4077 +Subproject commit 3db3c737230adc457e08a8d60b34458977d01e5c From 404f6d809cdf9301d0e84e9cfc3992ac53415e36 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Mon, 7 Mar 2022 09:20:04 +0100 Subject: [PATCH 081/338] chore: remove simple concurrency patch This patch isn't required, since we updated the concurrency implementation upstream. --- patches | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches b/patches index 10b82e9ae9b..41a6f660996 100644 --- a/patches +++ b/patches @@ -5,8 +5,6 @@ https://github.com/xing/act/pull/23.patch https://github.com/xing/act/pull/22.patch # feat: print plan summary upfront to executing it https://github.com/xing/act/pull/34.patch -# Revert "fix: add simple concurrency limit (#823)" -https://github.com/xing/act/pull/36.patch # ------------------------------------------- # SSH-agent authentication for cloning actions https://github.com/nektos/act/pull/939.patch From d4f46d92175cdbb53d6bb683abb4e3d38d54d435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Wed, 9 Mar 2022 13:16:46 +0000 Subject: [PATCH 082/338] chore: add patch for boolean compare --- patches | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches b/patches index 41a6f660996..7f8bc9cdd30 100644 --- a/patches +++ b/patches @@ -8,3 +8,5 @@ https://github.com/xing/act/pull/34.patch # ------------------------------------------- # SSH-agent authentication for cloning actions https://github.com/nektos/act/pull/939.patch +# fix: coerce booleans to numbers for comparison in exprparser +https://github.com/nektos/act/pull/1030.patch From 9d0876425e8fff821199b77e0d56a0799cf3c3e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 15 Mar 2022 08:04:05 +0000 Subject: [PATCH 083/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 3db3c737230..4d7107161e2 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 3db3c737230adc457e08a8d60b34458977d01e5c +Subproject commit 4d7107161e231406bee856258ec847844623224e From 70e9a462a2c55028e12f0b2d2377e0f55b5995cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 15 Mar 2022 08:08:07 +0000 Subject: [PATCH 084/338] patch: remove merged patch for expression evaluator bool fix --- patches | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches b/patches index 7f8bc9cdd30..41a6f660996 100644 --- a/patches +++ b/patches @@ -8,5 +8,3 @@ https://github.com/xing/act/pull/34.patch # ------------------------------------------- # SSH-agent authentication for cloning actions https://github.com/nektos/act/pull/939.patch -# fix: coerce booleans to numbers for comparison in exprparser -https://github.com/nektos/act/pull/1030.patch From 71464997bff1af597b18af1a7f7b634134eada1a Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 21 Mar 2022 14:37:20 +0000 Subject: [PATCH 085/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 4d7107161e2..f09cdb84436 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 4d7107161e231406bee856258ec847844623224e +Subproject commit f09cdb844367189aafe2f3af5795d3136db6b290 From 5389436cf9b3d8b98671915070387534a67c2e7d Mon Sep 17 00:00:00 2001 From: Robert Kowalski Date: Mon, 21 Mar 2022 16:07:36 +0100 Subject: [PATCH 086/338] fix: use depth 0 to savely apply patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit with depth=1 previously set not all patches would apply cleanly. this PR sets the clone depth to unlimited to solve the problem. Co-authored-by: Björn Brauer Co-authored-by: Markus Wolf --- .github/workflows/build-with-patches.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index fe0c1e8a546..04162469891 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -30,6 +30,7 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + fetch-depth: 0 - name: setup git run: | git config --global user.name github-actions @@ -49,6 +50,7 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + fetch-depth: 0 - name: setup git run: | git config --global user.name github-actions From 3a812a70fc086f78f24e35157aeb6cf77f7cbc61 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 22 Mar 2022 05:04:47 +0000 Subject: [PATCH 087/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index f09cdb84436..87175ecb688 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit f09cdb844367189aafe2f3af5795d3136db6b290 +Subproject commit 87175ecb6882f0735c1de8eeb884ced21f978873 From 4ed0a1b61d801b869eb2559eff65a87831ef2766 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 23 Mar 2022 05:04:42 +0000 Subject: [PATCH 088/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 87175ecb688..2bb3e74616f 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 87175ecb6882f0735c1de8eeb884ced21f978873 +Subproject commit 2bb3e74616f86ece6a11cd854ad54701542410fd From ddf4ae66abbc08b51e711d6c39a32b431c37abdf Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 26 Mar 2022 05:04:33 +0000 Subject: [PATCH 089/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 2bb3e74616f..c4db165d2d9 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 2bb3e74616f86ece6a11cd854ad54701542410fd +Subproject commit c4db165d2d9b1abbddbe5516d0820bebbb5ebc83 From 904d1178569ae1a518d859a6c32640a867a28e91 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Mon, 28 Mar 2022 09:36:07 +0200 Subject: [PATCH 090/338] chore: remove abandoned patch --- patches | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches b/patches index 41a6f660996..0f51339766a 100644 --- a/patches +++ b/patches @@ -6,5 +6,3 @@ https://github.com/xing/act/pull/22.patch # feat: print plan summary upfront to executing it https://github.com/xing/act/pull/34.patch # ------------------------------------------- -# SSH-agent authentication for cloning actions -https://github.com/nektos/act/pull/939.patch From 89407f00b4f06e596210a521c64ec5a6fea62a66 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 29 Mar 2022 07:01:56 +0000 Subject: [PATCH 091/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index c4db165d2d9..4f0bfd2ad1b 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit c4db165d2d9b1abbddbe5516d0820bebbb5ebc83 +Subproject commit 4f0bfd2ad1b16dc0a5f34844069513af178fe86d From a7d7995ef267155e7c5d9319af411975fa8cece4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Mon, 4 Apr 2022 09:07:08 +0000 Subject: [PATCH 092/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 4f0bfd2ad1b..e0044ba9131 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 4f0bfd2ad1b16dc0a5f34844069513af178fe86d +Subproject commit e0044ba913149be76acd64ca7d1a66f27532f4c7 From 65a441ee3cc09daae26786240b5d667c060b06c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Mon, 4 Apr 2022 09:15:45 +0000 Subject: [PATCH 093/338] chore: update to Golang 1.18 --- .github/workflows/build-with-patches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index 04162469891..bac05fa8790 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -3,7 +3,7 @@ name: Build act with patches on: [push] env: - GO_VERSION: 1.17 + GO_VERSION: 1.18 jobs: calculate-tag: From 93bab8c5b4a09fc85ab8f2ffd9770e7770faa1d7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 5 Apr 2022 05:04:55 +0000 Subject: [PATCH 094/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index e0044ba9131..407d324ec1a 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit e0044ba913149be76acd64ca7d1a66f27532f4c7 +Subproject commit 407d324ec1a5d9242114971e9e18e8469538924c From d8dc528e8035ec73f2ff5d193bd8cb0a9a881fa7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 6 Apr 2022 05:04:43 +0000 Subject: [PATCH 095/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 407d324ec1a..72dd2d344cc 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 407d324ec1a5d9242114971e9e18e8469538924c +Subproject commit 72dd2d344ccd420393f414b7c8f117ddb12188f1 From 560393f4204daea4fdbf9098e030c59f1b415290 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 12 Apr 2022 11:57:22 +0000 Subject: [PATCH 096/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 72dd2d344cc..74cda72c267 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 72dd2d344ccd420393f414b7c8f117ddb12188f1 +Subproject commit 74cda72c2672a1f665d5a55416cd93ca6292180a From ee5336ab336a7225175eef0ea5b2c274bc09496f Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Wed, 13 Apr 2022 10:25:55 +0200 Subject: [PATCH 097/338] chore: integrate pre/post step patches --- patches | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/patches b/patches index 0f51339766a..dceb3cc46fe 100644 --- a/patches +++ b/patches @@ -3,6 +3,12 @@ https://github.com/xing/act/pull/23.patch # customize goreleaser configuration https://github.com/xing/act/pull/22.patch +# ------------------------------------------- +# refactor: remove composite action runcontext workaround +https://github.com/nektos/act/pull/1085.patch +# implement pre and post steps +https://github.com/nektos/act/pull/1089.patch +# feat: implement pre-action step +https://github.com/nektos/act/pull/1110.patch # feat: print plan summary upfront to executing it https://github.com/xing/act/pull/34.patch -# ------------------------------------------- From d804faaa0910ca48f6f154c608a633c93b25bed2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 15 Apr 2022 05:09:05 +0000 Subject: [PATCH 098/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 74cda72c267..de1dea93795 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 74cda72c2672a1f665d5a55416cd93ca6292180a +Subproject commit de1dea93795ebf78e0ca531c35969f125035e8c4 From db1b590938fce7af5190829b35571df46723ace0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Mon, 25 Apr 2022 10:45:51 +0000 Subject: [PATCH 099/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index de1dea93795..3f2469bf538 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit de1dea93795ebf78e0ca531c35969f125035e8c4 +Subproject commit 3f2469bf5385b90da5f6a5d9922ccf9c9d7274a6 From 4e2b5b725a32228b30740cf6f2a6db5ceafad348 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 27 Apr 2022 05:13:35 +0000 Subject: [PATCH 100/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 3f2469bf538..77ddc89444d 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 3f2469bf5385b90da5f6a5d9922ccf9c9d7274a6 +Subproject commit 77ddc89444d8cca5be47a3c83074dcb992382e68 From bbc89874bfc0dc05934758983de6cc2cb26057b0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 2 May 2022 05:14:27 +0000 Subject: [PATCH 101/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 77ddc89444d..dfca2c57df9 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 77ddc89444d8cca5be47a3c83074dcb992382e68 +Subproject commit dfca2c57df978aae5ec8b29a1a80c0fba09b56a8 From a4340fbd7cea02bbe1c4e1e9bac79374240cfe8f Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 9 May 2022 09:05:11 +0000 Subject: [PATCH 102/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index dfca2c57df9..a76c3498723 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit dfca2c57df978aae5ec8b29a1a80c0fba09b56a8 +Subproject commit a76c34987233b065109457893a334879a4615baf From 26e1fc4d0136b0215ec6619939a8ed2b96e20435 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Wed, 11 May 2022 14:02:05 +0200 Subject: [PATCH 103/338] chore: add patch to handle invalid steps --- patches | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches b/patches index dceb3cc46fe..2b4f469f9d8 100644 --- a/patches +++ b/patches @@ -4,6 +4,8 @@ https://github.com/xing/act/pull/23.patch # customize goreleaser configuration https://github.com/xing/act/pull/22.patch # ------------------------------------------- +# fix: return invalid step type +https://github.com/nektos/act/pull/1157.patch # refactor: remove composite action runcontext workaround https://github.com/nektos/act/pull/1085.patch # implement pre and post steps From db85097f19d756df405c071da6ead0e2376821fa Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 12 May 2022 05:08:54 +0000 Subject: [PATCH 104/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index a76c3498723..1e72c594aca 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit a76c34987233b065109457893a334879a4615baf +Subproject commit 1e72c594aca1854854d40a24f3e038537f392fc8 From a335886892e5f1f1187e20c345aa510d1eb72ac5 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Thu, 12 May 2022 09:06:33 +0200 Subject: [PATCH 105/338] refactor: make patch script output more readable This adds some styling to the patch apply output to make it more readable. This ways it's easier to locate in which patch a conflict occurred. --- apply-patches.sh | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/apply-patches.sh b/apply-patches.sh index a0b9fcd085f..6ccaf3d6772 100755 --- a/apply-patches.sh +++ b/apply-patches.sh @@ -4,8 +4,22 @@ set -euo pipefail cd act || exit 1 -grep -v '^#' < ../patches | while IFS= read -r patch +comment= + +while IFS= read -r patch do - echo "Patch from: $patch" - curl -sL "$patch" | git am -3 || exit 1 -done + case "$patch" in + \#*) + comment="${patch#\# }" + ;; + http*) + echo + echo "--------------------------------------------------------------------------------" + echo " $comment" + echo + echo " Patch from: $patch" + echo + curl -sL "$patch" | git am -3 || exit 1 + ;; + esac +done < ../patches From ebe89a6c5d6976cb0c1b8a927c35758b61a88c47 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Thu, 12 May 2022 08:53:43 +0200 Subject: [PATCH 106/338] chore: remove patches which are merged upstream --- patches | 4 ---- 1 file changed, 4 deletions(-) diff --git a/patches b/patches index 2b4f469f9d8..c2d7a1bee8a 100644 --- a/patches +++ b/patches @@ -4,10 +4,6 @@ https://github.com/xing/act/pull/23.patch # customize goreleaser configuration https://github.com/xing/act/pull/22.patch # ------------------------------------------- -# fix: return invalid step type -https://github.com/nektos/act/pull/1157.patch -# refactor: remove composite action runcontext workaround -https://github.com/nektos/act/pull/1085.patch # implement pre and post steps https://github.com/nektos/act/pull/1089.patch # feat: implement pre-action step From 6954d3525b2626d56cc05de975a313bda86e014c Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 13 May 2022 05:19:31 +0000 Subject: [PATCH 107/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 1e72c594aca..91fd412c516 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 1e72c594aca1854854d40a24f3e038537f392fc8 +Subproject commit 91fd412c51667dd10c434e9eb16ba10685581fa6 From e2f3835d14553fca4e0d389abf00f4a5f03e3f55 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Fri, 13 May 2022 09:55:52 +0200 Subject: [PATCH 108/338] chore: remove pre-step patch --- patches | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches b/patches index c2d7a1bee8a..4d460f215c9 100644 --- a/patches +++ b/patches @@ -6,7 +6,5 @@ https://github.com/xing/act/pull/22.patch # ------------------------------------------- # implement pre and post steps https://github.com/nektos/act/pull/1089.patch -# feat: implement pre-action step -https://github.com/nektos/act/pull/1110.patch # feat: print plan summary upfront to executing it https://github.com/xing/act/pull/34.patch From 3a1371d8ade3b7fb6e22dba1580057810a461ad0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 16 May 2022 07:38:07 +0000 Subject: [PATCH 109/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 91fd412c516..89947735d50 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 91fd412c51667dd10c434e9eb16ba10685581fa6 +Subproject commit 89947735d508751b9e84d653635dec91299e9eec From b2d4edc55a04fa1516eb969c2cefd90a752beaf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Mon, 16 May 2022 14:33:31 +0000 Subject: [PATCH 110/338] chore: update sync workflow to handle workflow updates Co-authored-by: Markus Wolf --- .github/workflows/sync-upstream.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml index b0c83ddee27..0e857d6c5ad 100644 --- a/.github/workflows/sync-upstream.yml +++ b/.github/workflows/sync-upstream.yml @@ -9,22 +9,27 @@ jobs: sync: runs-on: ubuntu-latest steps: + - name: Get Token with workflows permission + id: get_workflow_token + uses: xing/workflow-application-token-action@main + with: + application_id: ${{ secrets.XING_ACTIONS_APP_ID }} + application_private_key: ${{ secrets.XING_ACTIONS_PRIVATE_KEY }} + permissions: "contents:write,workflows:write" - uses: actions/checkout@v2 + name: Reset xing/act#master to latest nektos/act#master with: ref: master + token: ${{ steps.get_workflow_token.outputs.token }} - run: | + git config user.name github-actions + git config user.email github-actions@github.com git remote add upstream https://github.com/nektos/act.git git fetch upstream git reset --hard upstream/master git push --follow-tags --force origin master - - name: Get Token - id: get_workflow_token - uses: xing/workflow-application-token-action@main - with: - application_id: ${{ secrets.XING_ACTIONS_APP_ID }} - application_private_key: ${{ secrets.XING_ACTIONS_PRIVATE_KEY }} - permissions: "contents:write" - uses: actions/checkout@v2 + name: Update act submodule and push to xing/act#distribution with: ref: distribution submodules: true From 2669d72679cc0e2c1048b41da73d0e5f952fd5c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Mon, 16 May 2022 14:34:38 +0000 Subject: [PATCH 111/338] chore: allow build-with-patches to be triggered manually Co-authored-by: Markus Wolf --- .github/workflows/build-with-patches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index bac05fa8790..b8f5cfdd9fc 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -1,6 +1,6 @@ name: Build act with patches -on: [push] +on: [push, workflow_dispatch] env: GO_VERSION: 1.18 From 9b4ec81e2cfdd3587b0b39f87226d03cee0ff605 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 18 May 2022 05:08:02 +0000 Subject: [PATCH 112/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 89947735d50..69691c88b30 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 89947735d508751b9e84d653635dec91299e9eec +Subproject commit 69691c88b301ee695f5712d2ce8ad2b760725c80 From a62dc9a204bac1424ebcba7a4b10f28e062bb3bd Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Wed, 18 May 2022 15:29:12 +0200 Subject: [PATCH 113/338] chore: add improved logging patch --- patches | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/patches b/patches index 4d460f215c9..100e1f48003 100644 --- a/patches +++ b/patches @@ -6,5 +6,7 @@ https://github.com/xing/act/pull/22.patch # ------------------------------------------- # implement pre and post steps https://github.com/nektos/act/pull/1089.patch +# Improve logging +https://github.com/nektos/act/pull/1171.patch # feat: print plan summary upfront to executing it -https://github.com/xing/act/pull/34.patch +https://github.com/xing/act/pull/53.patch From 7329595793d90facdec955c29a8e20b30d092c77 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 19 May 2022 05:08:30 +0000 Subject: [PATCH 114/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 69691c88b30..166d0630593 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 69691c88b301ee695f5712d2ce8ad2b760725c80 +Subproject commit 166d0630593b40a288cc0190d4aa3e20b31d1461 From 155a29d7fb088d2c9f977c7331a3600c7d6e4dfe Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 23 May 2022 05:08:59 +0000 Subject: [PATCH 115/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 166d0630593..50544556f86 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 166d0630593b40a288cc0190d4aa3e20b31d1461 +Subproject commit 50544556f8672c5553fd5241f4adb157698c781b From b4c0dab0576ffff9da348e9f6f0d318c41cf04db Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 24 May 2022 05:09:02 +0000 Subject: [PATCH 116/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 50544556f86..ebb408f373a 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 50544556f8672c5553fd5241f4adb157698c781b +Subproject commit ebb408f373a4fc6508d1d75aa6fddcba5fc7df81 From 319f9d4bf1d0e5bad4811aff959f5713771f5c64 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Tue, 24 May 2022 14:20:19 +0200 Subject: [PATCH 117/338] chore: add patch to allow abort of act run --- patches | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches b/patches index 100e1f48003..7d6128db7e3 100644 --- a/patches +++ b/patches @@ -10,3 +10,5 @@ https://github.com/nektos/act/pull/1089.patch https://github.com/nektos/act/pull/1171.patch # feat: print plan summary upfront to executing it https://github.com/xing/act/pull/53.patch +# Squashed and patched allow to interrupt execution +https://github.com/xing/act/pull/54.patch From c2c50ef11b05e449fae0c385544c70c9dd786169 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 24 May 2022 13:47:49 +0000 Subject: [PATCH 118/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index ebb408f373a..943a0e6eea2 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit ebb408f373a4fc6508d1d75aa6fddcba5fc7df81 +Subproject commit 943a0e6eea2f67783018b9d3bc375a6a7dd65ab3 From a730c17f91647907191da446778585c9e96d7784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 24 May 2022 14:05:06 +0000 Subject: [PATCH 119/338] chore: remove pre/post patch Co-authored-by: Markus Wolf --- patches | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches b/patches index 7d6128db7e3..6bf0e43db45 100644 --- a/patches +++ b/patches @@ -4,8 +4,6 @@ https://github.com/xing/act/pull/23.patch # customize goreleaser configuration https://github.com/xing/act/pull/22.patch # ------------------------------------------- -# implement pre and post steps -https://github.com/nektos/act/pull/1089.patch # Improve logging https://github.com/nektos/act/pull/1171.patch # feat: print plan summary upfront to executing it From 2959689c4126ab93c26100d0721852571bd6b302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 24 May 2022 13:45:52 +0000 Subject: [PATCH 120/338] patch: add job logger restoration after cancellation Co-authored-by: Markus Wolf --- patches | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches b/patches index 6bf0e43db45..1d35b792171 100644 --- a/patches +++ b/patches @@ -10,3 +10,5 @@ https://github.com/nektos/act/pull/1171.patch https://github.com/xing/act/pull/53.patch # Squashed and patched allow to interrupt execution https://github.com/xing/act/pull/54.patch +# fix: restore job logger for clean-up tasks after cancellation +https://github.com/xing/act/pull/56.patch From 9118ec2522d05f7969066af3a0ffdd32e97f730e Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 25 May 2022 05:07:44 +0000 Subject: [PATCH 121/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 943a0e6eea2..bc0f09b9ea1 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 943a0e6eea2f67783018b9d3bc375a6a7dd65ab3 +Subproject commit bc0f09b9ea1df599011787f51d296bd793e7cfb5 From 13de746b78bf176302d6c7ac3d255c2fb44ba9a0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 27 May 2022 05:08:14 +0000 Subject: [PATCH 122/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index bc0f09b9ea1..8bc3a07dad8 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit bc0f09b9ea1df599011787f51d296bd793e7cfb5 +Subproject commit 8bc3a07dad878ec9b4bb797d91f368f11ffebdbe From 57790b209da88ead88a8a837a21557c533166655 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 30 May 2022 05:11:51 +0000 Subject: [PATCH 123/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 8bc3a07dad8..64387bcf7b9 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 8bc3a07dad878ec9b4bb797d91f368f11ffebdbe +Subproject commit 64387bcf7b92f07b42a4c93f7e4504219af5df2c From 7ad8be8e1a332b4736cc0eb78437eb2b7c637048 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 6 Jun 2022 05:06:02 +0000 Subject: [PATCH 124/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 64387bcf7b9..859445fb94e 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 64387bcf7b92f07b42a4c93f7e4504219af5df2c +Subproject commit 859445fb94e12cc600e5a59d9c9cd687214cb801 From fcc88c8c9a1f1e8db0d4ddfab1bc52839923434d Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 8 Jun 2022 05:05:10 +0000 Subject: [PATCH 125/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 859445fb94e..b7d380b3f09 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 859445fb94e12cc600e5a59d9c9cd687214cb801 +Subproject commit b7d380b3f096e079f2c1ba91a9377752fc4c9751 From 71d557405ef3768afff0894a20dd3cff3394b107 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 9 Jun 2022 05:04:59 +0000 Subject: [PATCH 126/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index b7d380b3f09..8a473943c3d 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit b7d380b3f096e079f2c1ba91a9377752fc4c9751 +Subproject commit 8a473943c3dffbbf47c2a2ef8b261e845646fa6e From 3b4a58f6fb815af5e65f4dbb6ec0c5651fb8d289 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 11 Jun 2022 05:04:37 +0000 Subject: [PATCH 127/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 8a473943c3d..2aa0699aecf 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 8a473943c3dffbbf47c2a2ef8b261e845646fa6e +Subproject commit 2aa0699aecff2e596e280165ea48eac85c5f9a6a From 67f742305c49289f6123b3af2551dbb90e96d3ac Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 13 Jun 2022 05:09:33 +0000 Subject: [PATCH 128/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 2aa0699aecf..3415347efcd 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 2aa0699aecff2e596e280165ea48eac85c5f9a6a +Subproject commit 3415347efcdf6d6d7544c5df7cb33e6db043ff4a From 8d2aff962f7279de6327e295a1cdf3b498aa5946 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Mon, 13 Jun 2022 13:40:47 +0200 Subject: [PATCH 129/338] chore: remove upstream merged pr --- patches | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches b/patches index 1d35b792171..377b3f4b1ff 100644 --- a/patches +++ b/patches @@ -8,7 +8,5 @@ https://github.com/xing/act/pull/22.patch https://github.com/nektos/act/pull/1171.patch # feat: print plan summary upfront to executing it https://github.com/xing/act/pull/53.patch -# Squashed and patched allow to interrupt execution -https://github.com/xing/act/pull/54.patch # fix: restore job logger for clean-up tasks after cancellation https://github.com/xing/act/pull/56.patch From 274c0a4eeec115c15bcfdbb0be8c7677ae0b0161 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Tue, 14 Jun 2022 10:07:50 +0200 Subject: [PATCH 130/338] chore: add patch to keep action inputs intact --- patches | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches b/patches index 377b3f4b1ff..a8291854198 100644 --- a/patches +++ b/patches @@ -10,3 +10,5 @@ https://github.com/nektos/act/pull/1171.patch https://github.com/xing/act/pull/53.patch # fix: restore job logger for clean-up tasks after cancellation https://github.com/xing/act/pull/56.patch +# fix: keep action inputs +https://github.com/xing/act/pull/59.patch From f2b1e55d924d1b888da9332f31822ca909d81740 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 17 Jun 2022 05:06:28 +0000 Subject: [PATCH 131/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 3415347efcd..52f5c4592cb 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 3415347efcdf6d6d7544c5df7cb33e6db043ff4a +Subproject commit 52f5c4592cbbf2e4dde3b35ad42f4e7475ad52df From c69d1217d2011339cad1add4a3139c1fc191c1ad Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 18 Jun 2022 05:04:30 +0000 Subject: [PATCH 132/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 52f5c4592cb..4391a10d5a0 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 52f5c4592cbbf2e4dde3b35ad42f4e7475ad52df +Subproject commit 4391a10d5a013afb3a4cbc1640eb745132593d7a From dabecb0d76a06fedd44acda55f2bdd996154c965 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Mon, 20 Jun 2022 13:41:21 +0200 Subject: [PATCH 133/338] chore: remove logging improvment patch --- patches | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/patches b/patches index a8291854198..45755a60795 100644 --- a/patches +++ b/patches @@ -4,11 +4,9 @@ https://github.com/xing/act/pull/23.patch # customize goreleaser configuration https://github.com/xing/act/pull/22.patch # ------------------------------------------- -# Improve logging -https://github.com/nektos/act/pull/1171.patch # feat: print plan summary upfront to executing it https://github.com/xing/act/pull/53.patch # fix: restore job logger for clean-up tasks after cancellation https://github.com/xing/act/pull/56.patch # fix: keep action inputs -https://github.com/xing/act/pull/59.patch +https://github.com/nektos/act/pull/1215.patch From 8670bb6499426ad6164cce72f463e61c17ff18f6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 21 Jun 2022 05:08:42 +0000 Subject: [PATCH 134/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 4391a10d5a0..9d7595ab119 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 4391a10d5a013afb3a4cbc1640eb745132593d7a +Subproject commit 9d7595ab119c75e1b1f4cd5dca9898fc14c6718a From 91cd1f67077348bd56268a9c332d6903e876dd19 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 22 Jun 2022 05:07:54 +0000 Subject: [PATCH 135/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 9d7595ab119..f71f2778f0e 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 9d7595ab119c75e1b1f4cd5dca9898fc14c6718a +Subproject commit f71f2778f0e75e3e28a81f8f726c64f27b7fffa3 From e27e8d47a56b792e94b84eb719797a996a7471d0 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Wed, 22 Jun 2022 08:59:30 +0200 Subject: [PATCH 136/338] chore: remove upstream patch This is integrated in upstream and could be removed --- patches | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches b/patches index 45755a60795..7fdbe167f73 100644 --- a/patches +++ b/patches @@ -8,5 +8,3 @@ https://github.com/xing/act/pull/22.patch https://github.com/xing/act/pull/53.patch # fix: restore job logger for clean-up tasks after cancellation https://github.com/xing/act/pull/56.patch -# fix: keep action inputs -https://github.com/nektos/act/pull/1215.patch From e8ea1af689b9280171109d279d0d97e0183e37eb Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 27 Jun 2022 05:13:22 +0000 Subject: [PATCH 137/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index f71f2778f0e..c67abf2401b 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit f71f2778f0e75e3e28a81f8f726c64f27b7fffa3 +Subproject commit c67abf2401ba57097e862b524b86de7171f1c609 From d0418c189606d9eff52944129eba1c4b263c630e Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 30 Jun 2022 05:10:13 +0000 Subject: [PATCH 138/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index c67abf2401b..9499612b581 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit c67abf2401ba57097e862b524b86de7171f1c609 +Subproject commit 9499612b5818774c5c6d73fbf2596ed464b7b01d From 303e61d40d8df3d501a201294a68213419e08480 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 4 Jul 2022 05:13:07 +0000 Subject: [PATCH 139/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 9499612b581..4d9d6ecc924 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 9499612b5818774c5c6d73fbf2596ed464b7b01d +Subproject commit 4d9d6ecc924bef6c5976acd7f224558e21fa5b5f From 89d62a40a3b5e212f2c7bd9b5bb3aea945995313 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 6 Jul 2022 05:12:13 +0000 Subject: [PATCH 140/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 4d9d6ecc924..aea17b1aa67 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 4d9d6ecc924bef6c5976acd7f224558e21fa5b5f +Subproject commit aea17b1aa67957a00c5b792e6dabdca608ef195b From f4273e3d5b3fc6310ada373e0582a99b0cbc7bbe Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 8 Jul 2022 05:10:26 +0000 Subject: [PATCH 141/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index aea17b1aa67..91296bd5eb0 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit aea17b1aa67957a00c5b792e6dabdca608ef195b +Subproject commit 91296bd5eb022dce9e7891540257232b3e9906e1 From 1cbce6f743e5d2f9f308dcbddb95548ae6dd7c20 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 9 Jul 2022 05:06:30 +0000 Subject: [PATCH 142/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 91296bd5eb0..a5ceb54cafe 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 91296bd5eb022dce9e7891540257232b3e9906e1 +Subproject commit a5ceb54cafebf8e8c7e3a569f2af1122bf655ca3 From 9bd3a19367bcd2c08d5ca65627d8b1547dbc3c90 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Tue, 12 Jul 2022 10:00:05 +0200 Subject: [PATCH 143/338] chore: add patch to handle number interpretation --- patches | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches b/patches index 7fdbe167f73..d16090ab8e4 100644 --- a/patches +++ b/patches @@ -8,3 +8,5 @@ https://github.com/xing/act/pull/22.patch https://github.com/xing/act/pull/53.patch # fix: restore job logger for clean-up tasks after cancellation https://github.com/xing/act/pull/56.patch +# fix: the number in the github event is of type number +https://github.com/nektos/act/pull/1252.patch From 483813553f1cf76a6f831f029b14f8815b9a968a Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 13 Jul 2022 05:09:29 +0000 Subject: [PATCH 144/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index a5ceb54cafe..409446211fe 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit a5ceb54cafebf8e8c7e3a569f2af1122bf655ca3 +Subproject commit 409446211fe99420d5d3761b04f491f8ef52412d From 82877ad28704e86a712b2ff68e6463ca03d17c27 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Thu, 21 Jul 2022 09:05:50 +0200 Subject: [PATCH 145/338] chore: remove patch The patch was merged upstream and we must not apply it again --- patches | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches b/patches index d16090ab8e4..7fdbe167f73 100644 --- a/patches +++ b/patches @@ -8,5 +8,3 @@ https://github.com/xing/act/pull/22.patch https://github.com/xing/act/pull/53.patch # fix: restore job logger for clean-up tasks after cancellation https://github.com/xing/act/pull/56.patch -# fix: the number in the github event is of type number -https://github.com/nektos/act/pull/1252.patch From b89e7a1454a9f608b0d861853a0196d44ad17e51 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 26 Jul 2022 05:21:49 +0000 Subject: [PATCH 146/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 409446211fe..17dd54d6923 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 409446211fe99420d5d3761b04f491f8ef52412d +Subproject commit 17dd54d69231884ea561fe2bd0c0e059debd2658 From 1aed34f1624e72022447358cdcd86dd077dda9b8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 28 Jul 2022 05:12:02 +0000 Subject: [PATCH 147/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 17dd54d6923..5f5b8959d6b 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 17dd54d69231884ea561fe2bd0c0e059debd2658 +Subproject commit 5f5b8959d6b12b034dfa64e91f8b17c97808eda5 From 7d3021d187c3baac6715c82572a21cba1b78e58f Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 29 Jul 2022 05:13:25 +0000 Subject: [PATCH 148/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 5f5b8959d6b..9d76bac4eff 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 5f5b8959d6b12b034dfa64e91f8b17c97808eda5 +Subproject commit 9d76bac4effa3b47462430194fa3294ed130f1ff From d1d0bc39de716262782bfa3a108b6ae24b385af5 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Fri, 29 Jul 2022 12:22:30 +0200 Subject: [PATCH 149/338] chore: add two bug fixes --- patches | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/patches b/patches index 7fdbe167f73..0b2b7c5cf91 100644 --- a/patches +++ b/patches @@ -8,3 +8,7 @@ https://github.com/xing/act/pull/22.patch https://github.com/xing/act/pull/53.patch # fix: restore job logger for clean-up tasks after cancellation https://github.com/xing/act/pull/56.patch +# refactor: ignore already closed error +https://github.com/nektos/act/pull/1285.patch +# fix: ensure all post steps are executed +https://github.com/nektos/act/pull/1286.patch From 148ac407b1540eefa4f57f06aa3bbf02317fe8a9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 30 Jul 2022 05:07:31 +0000 Subject: [PATCH 150/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 9d76bac4eff..3364f95569d 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 9d76bac4effa3b47462430194fa3294ed130f1ff +Subproject commit 3364f95569d8a39d440b18af69d29421fcc77b55 From bb19c91582b73d4e8584ba108c60f2d490e363e7 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Wed, 3 Aug 2022 09:09:40 +0200 Subject: [PATCH 151/338] chore: remove obsolete patch --- patches | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/patches b/patches index 0b2b7c5cf91..f94aafc6540 100644 --- a/patches +++ b/patches @@ -1,14 +1,12 @@ # these patches will stay downstream forever # update owner name from nektos to xing -https://github.com/xing/act/pull/23.patch +https://github.com/xing/act/pull/23 # customize goreleaser configuration -https://github.com/xing/act/pull/22.patch +https://github.com/xing/act/pull/22 # ------------------------------------------- # feat: print plan summary upfront to executing it -https://github.com/xing/act/pull/53.patch +https://github.com/xing/act/pull/53 # fix: restore job logger for clean-up tasks after cancellation -https://github.com/xing/act/pull/56.patch +https://github.com/xing/act/pull/56 # refactor: ignore already closed error -https://github.com/nektos/act/pull/1285.patch -# fix: ensure all post steps are executed -https://github.com/nektos/act/pull/1286.patch +https://github.com/nektos/act/pull/1285 From 54797a32765d06eacb3e596225a1df033a92edfc Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Wed, 3 Aug 2022 09:10:02 +0200 Subject: [PATCH 152/338] chore: make sure all patch urls end with .patch --- apply-patches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apply-patches.sh b/apply-patches.sh index 6ccaf3d6772..cb32bb9da59 100755 --- a/apply-patches.sh +++ b/apply-patches.sh @@ -19,7 +19,7 @@ do echo echo " Patch from: $patch" echo - curl -sL "$patch" | git am -3 || exit 1 + curl -sL "${patch/%.patch}.patch" | git am -3 || exit 1 ;; esac done < ../patches From 3158190c45a7534afbda19500493860d234cba6b Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 7 Aug 2022 05:04:46 +0000 Subject: [PATCH 153/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 3364f95569d..3387fd72ee1 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 3364f95569d8a39d440b18af69d29421fcc77b55 +Subproject commit 3387fd72ee138893b953e2b8b23efceb23bfefef From ad9b89c71b370d22797c64087c7fe945985561b9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 8 Aug 2022 05:08:03 +0000 Subject: [PATCH 154/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 3387fd72ee1..92ddcdae098 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 3387fd72ee138893b953e2b8b23efceb23bfefef +Subproject commit 92ddcdae098873ad6d9c05748ce5b6c7be83b811 From ef1698ddc229ed2b39a37462fffba85702c03f05 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Tue, 9 Aug 2022 14:58:39 +0200 Subject: [PATCH 155/338] chore: remove patch which was merged upstream --- patches | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches b/patches index f94aafc6540..e18790e3427 100644 --- a/patches +++ b/patches @@ -8,5 +8,3 @@ https://github.com/xing/act/pull/22 https://github.com/xing/act/pull/53 # fix: restore job logger for clean-up tasks after cancellation https://github.com/xing/act/pull/56 -# refactor: ignore already closed error -https://github.com/nektos/act/pull/1285 From c0eb34890d45e79e051f2cfd7ce3ff7a490fd0f8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 15 Aug 2022 05:20:20 +0000 Subject: [PATCH 156/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 92ddcdae098..12029e3df58 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 92ddcdae098873ad6d9c05748ce5b6c7be83b811 +Subproject commit 12029e3df5841538a806293881f836f88ec07a2c From 3eb1d5b3acce76dd7070bb86c117c2b356de0d96 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 22 Aug 2022 05:24:54 +0000 Subject: [PATCH 157/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 12029e3df58..b23bbefc365 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 12029e3df5841538a806293881f836f88ec07a2c +Subproject commit b23bbefc365012886192e477a88d38a0909ecba1 From 867a1a42daeae751e28ffd3d9c248234a984bd7b Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 29 Aug 2022 05:32:51 +0000 Subject: [PATCH 158/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index b23bbefc365..8bad6aca50b 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit b23bbefc365012886192e477a88d38a0909ecba1 +Subproject commit 8bad6aca50b7595fcc5253c72a2936fe37157a63 From 392c30980e4cb68434df96d1a754f39215e820df Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 30 Aug 2022 05:34:25 +0000 Subject: [PATCH 159/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 8bad6aca50b..e1b906813e9 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 8bad6aca50b7595fcc5253c72a2936fe37157a63 +Subproject commit e1b906813e9053c57ef1c9f7d535532cd7924602 From a97b931a74edeb5f5470afa13207a980d34c5e9a Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 1 Sep 2022 05:27:09 +0000 Subject: [PATCH 160/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index e1b906813e9..a20b1d4669d 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit e1b906813e9053c57ef1c9f7d535532cd7924602 +Subproject commit a20b1d4669d8d032fe35347bd3cfdae58b4d1d97 From 0deba00e9723476b6217d8e1918296a2039fc658 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 7 Sep 2022 05:33:08 +0000 Subject: [PATCH 161/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index a20b1d4669d..b514649c3da 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit a20b1d4669d8d032fe35347bd3cfdae58b4d1d97 +Subproject commit b514649c3da64a1be92b8e22b50e296a07d759f6 From f3c83bebcef20e85e299130d1ac150e4ffff647c Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 9 Sep 2022 05:27:16 +0000 Subject: [PATCH 162/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index b514649c3da..d1daf2f28d8 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit b514649c3da64a1be92b8e22b50e296a07d759f6 +Subproject commit d1daf2f28d8c2256e5712e3064ce6ac45fca2562 From 092d34c5bba6bd41903fde9609191c75d3cecbb6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 12 Sep 2022 05:33:08 +0000 Subject: [PATCH 163/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index d1daf2f28d8..3a0fe6967fd 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit d1daf2f28d8c2256e5712e3064ce6ac45fca2562 +Subproject commit 3a0fe6967fd8ecd3cb86550d0225d55a0bb37ac9 From 4705d8a9ab281948dea3cda091e24b2fd84ee1f4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 19 Sep 2022 05:33:36 +0000 Subject: [PATCH 164/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 3a0fe6967fd..053bff19a71 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 3a0fe6967fd8ecd3cb86550d0225d55a0bb37ac9 +Subproject commit 053bff19a710669308da5e356ab028bab2a70b5d From a9c843ba076c17a3f798eb38e583d2d9d73c7d7f Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 22 Sep 2022 05:31:18 +0000 Subject: [PATCH 165/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 053bff19a71..fb3368921a1 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 053bff19a710669308da5e356ab028bab2a70b5d +Subproject commit fb3368921a17391c94f02a5c544f6578716f7954 From 678d59abd87bd38afef9c3225b50f72e2f5d12ee Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 23 Sep 2022 05:31:41 +0000 Subject: [PATCH 166/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index fb3368921a1..96ba76bff23 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit fb3368921a17391c94f02a5c544f6578716f7954 +Subproject commit 96ba76bff23f2cc2345437ffc6b1815447ef1e45 From ddc99d6492fabbe1fbb19040cea4e3fabc840f4a Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 26 Sep 2022 05:32:57 +0000 Subject: [PATCH 167/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 96ba76bff23..d137ec82852 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 96ba76bff23f2cc2345437ffc6b1815447ef1e45 +Subproject commit d137ec82852083eef45009dcaf368c3dcdd0b9a6 From fb8ee48474242627b53b61fd9c3de86315829c03 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Mon, 26 Sep 2022 11:02:21 +0200 Subject: [PATCH 168/338] chore: add patch --- patches | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches b/patches index e18790e3427..95096770a18 100644 --- a/patches +++ b/patches @@ -8,3 +8,5 @@ https://github.com/xing/act/pull/22 https://github.com/xing/act/pull/53 # fix: restore job logger for clean-up tasks after cancellation https://github.com/xing/act/pull/56 +# fix: align github.ref to GitHub Action +https://github.com/nektos/act/pull/1362 From 2fb88ed6ff240c724281c241d5724c071d52953e Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 27 Sep 2022 05:30:12 +0000 Subject: [PATCH 169/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index d137ec82852..97c083e902a 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit d137ec82852083eef45009dcaf368c3dcdd0b9a6 +Subproject commit 97c083e902a86010ce6267347b830e91fe2435e1 From 1c0b3e5dfb668906748be638962e2ca5c46ce886 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Tue, 27 Sep 2022 09:06:33 +0200 Subject: [PATCH 170/338] chore: remove patch which was merged upstream --- patches | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches b/patches index 95096770a18..e18790e3427 100644 --- a/patches +++ b/patches @@ -8,5 +8,3 @@ https://github.com/xing/act/pull/22 https://github.com/xing/act/pull/53 # fix: restore job logger for clean-up tasks after cancellation https://github.com/xing/act/pull/56 -# fix: align github.ref to GitHub Action -https://github.com/nektos/act/pull/1362 From 59b9b0a06666e546924b95706eefa715bddc1f15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 27 Sep 2022 12:16:06 +0000 Subject: [PATCH 171/338] chore: add patch for matrix job logger Co-authored-by: Markus Wolf --- patches | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches b/patches index e18790e3427..832003948bb 100644 --- a/patches +++ b/patches @@ -8,3 +8,5 @@ https://github.com/xing/act/pull/22 https://github.com/xing/act/pull/53 # fix: restore job logger for clean-up tasks after cancellation https://github.com/xing/act/pull/56 +# feat: pass current matrix information to job logger +https://github.com/nektos/act/pull/1364 From 4c317959e6eaff75099af54a6a5414ea776da303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 27 Sep 2022 14:51:31 +0000 Subject: [PATCH 172/338] Revert "chore: add patch for matrix job logger" This reverts commit 59b9b0a06666e546924b95706eefa715bddc1f15. --- patches | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches b/patches index 832003948bb..e18790e3427 100644 --- a/patches +++ b/patches @@ -8,5 +8,3 @@ https://github.com/xing/act/pull/22 https://github.com/xing/act/pull/53 # fix: restore job logger for clean-up tasks after cancellation https://github.com/xing/act/pull/56 -# feat: pass current matrix information to job logger -https://github.com/nektos/act/pull/1364 From a540be745fde3e5226fbe11a3d910e3061d5fb76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 27 Sep 2022 14:42:07 +0000 Subject: [PATCH 173/338] chore: remove patch for plan summary With our new json-based log parser, we don't need the plan summary. Co-authored-by: Markus Wolf --- patches | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches b/patches index e18790e3427..ae86169fa3a 100644 --- a/patches +++ b/patches @@ -4,7 +4,5 @@ https://github.com/xing/act/pull/23 # customize goreleaser configuration https://github.com/xing/act/pull/22 # ------------------------------------------- -# feat: print plan summary upfront to executing it -https://github.com/xing/act/pull/53 # fix: restore job logger for clean-up tasks after cancellation https://github.com/xing/act/pull/56 From 8ed9d22bab90427f39e31b2e395ff1a4a5f3473e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Tue, 27 Sep 2022 15:31:24 +0000 Subject: [PATCH 174/338] chore: use upstream pr as patch for "restore job logger" Co-authored-by: Markus Wolf --- patches | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches b/patches index ae86169fa3a..855c5c13fc2 100644 --- a/patches +++ b/patches @@ -5,4 +5,4 @@ https://github.com/xing/act/pull/23 https://github.com/xing/act/pull/22 # ------------------------------------------- # fix: restore job logger for clean-up tasks after cancellation -https://github.com/xing/act/pull/56 +https://github.com/nektos/act/pull/1365 From e462220e2b5b7a2928b2f9274bdb70ac68fc5256 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 27 Sep 2022 15:58:20 +0000 Subject: [PATCH 175/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 97c083e902a..00acf681880 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 97c083e902a86010ce6267347b830e91fe2435e1 +Subproject commit 00acf681880b0fe7cea27a29d61c261d624966c3 From f9150feb131f8890ce40b5ad9f0e11bf11ca463e Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 28 Sep 2022 05:33:15 +0000 Subject: [PATCH 176/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 00acf681880..13d530302e5 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 00acf681880b0fe7cea27a29d61c261d624966c3 +Subproject commit 13d530302e5f8203b0f104155eb6e136f5aaf910 From 653829841a20590cc6491312b4e36031fe5d3e53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Brauer?= Date: Wed, 28 Sep 2022 08:52:38 +0000 Subject: [PATCH 177/338] chore: remove restore job logger patch because it has been upstreamed --- patches | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches b/patches index 855c5c13fc2..c4fc93da9d9 100644 --- a/patches +++ b/patches @@ -4,5 +4,3 @@ https://github.com/xing/act/pull/23 # customize goreleaser configuration https://github.com/xing/act/pull/22 # ------------------------------------------- -# fix: restore job logger for clean-up tasks after cancellation -https://github.com/nektos/act/pull/1365 From a903b0c7acbe451f1ee9c00a7412f2aca60b37ed Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 30 Sep 2022 05:31:13 +0000 Subject: [PATCH 178/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 13d530302e5..21484b5c1ec 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 13d530302e5f8203b0f104155eb6e136f5aaf910 +Subproject commit 21484b5c1ecbd9e1ddb6a57debd7731a3e1fc25f From cc524a698a12302c46bbcb5e327d2fb2c6ee8faf Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 3 Oct 2022 05:19:54 +0000 Subject: [PATCH 179/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 21484b5c1ec..bec45d0dc46 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 21484b5c1ecbd9e1ddb6a57debd7731a3e1fc25f +Subproject commit bec45d0dc46e2ccae81c521f3db313b04b0c0831 From a0432f1174385873fe1fe2b0f5ddb3ae43882b6e Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 5 Oct 2022 05:21:01 +0000 Subject: [PATCH 180/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index bec45d0dc46..79384c35ab4 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit bec45d0dc46e2ccae81c521f3db313b04b0c0831 +Subproject commit 79384c35ab42715144388b7d3e0b0290fb93a962 From baea6e91062e6d43ceeeff680bc104c482d0e77c Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 6 Oct 2022 05:16:53 +0000 Subject: [PATCH 181/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 79384c35ab4..1bade275342 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 79384c35ab42715144388b7d3e0b0290fb93a962 +Subproject commit 1bade27534209f2fd2d7a0b6437efb4965b648c8 From 8b9b149b7ef88d07bbad6cea0a491472af27b7e1 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Wed, 5 Oct 2022 11:44:11 +0200 Subject: [PATCH 182/338] chore: add upstream patch --- patches | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches b/patches index c4fc93da9d9..bdb6b30bb5e 100644 --- a/patches +++ b/patches @@ -4,3 +4,5 @@ https://github.com/xing/act/pull/23 # customize goreleaser configuration https://github.com/xing/act/pull/22 # ------------------------------------------- +# fix: handle go closure iteration +https://github.com/nektos/act/pull/1374 From ab9335af4899982544812c5c7abb7d7687ededa3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 7 Oct 2022 05:16:39 +0000 Subject: [PATCH 183/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 1bade275342..48188a6280f 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 1bade27534209f2fd2d7a0b6437efb4965b648c8 +Subproject commit 48188a6280f367e63936a239976be65317ebabd2 From 0680582d790874cbc07b6710db34025151f1cd7c Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Fri, 7 Oct 2022 10:08:02 +0200 Subject: [PATCH 184/338] chore: add patch --- patches | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches b/patches index bdb6b30bb5e..66f3d46e28b 100644 --- a/patches +++ b/patches @@ -4,5 +4,5 @@ https://github.com/xing/act/pull/23 # customize goreleaser configuration https://github.com/xing/act/pull/22 # ------------------------------------------- -# fix: handle go closure iteration -https://github.com/nektos/act/pull/1374 +# revert docker options parsering changes +https://github.com/xing/act/pull/77 From 63959106b66338a64db423792698e1391294ba72 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 8 Oct 2022 05:14:39 +0000 Subject: [PATCH 185/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 48188a6280f..36310139e07 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 48188a6280f367e63936a239976be65317ebabd2 +Subproject commit 36310139e07b29768700e312c92ea49635f0d1ac From d2c600ebb9a6e1f33c5f98218fbbb38ca090dea4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 10 Oct 2022 05:32:52 +0000 Subject: [PATCH 186/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 36310139e07..4541139109f 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 36310139e07b29768700e312c92ea49635f0d1ac +Subproject commit 4541139109f2838bcac25ddd3d435a5c0661bf25 From 47f9d1fc348c7d0cb633e0353eb08a2b9eaa049f Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Mon, 10 Oct 2022 11:06:54 +0200 Subject: [PATCH 187/338] chore: replace revert with upstream patch --- patches | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches b/patches index 66f3d46e28b..f635e4174b7 100644 --- a/patches +++ b/patches @@ -4,5 +4,5 @@ https://github.com/xing/act/pull/23 # customize goreleaser configuration https://github.com/xing/act/pull/22 # ------------------------------------------- -# revert docker options parsering changes -https://github.com/xing/act/pull/77 +# test: add test for networking setup in act +https://github.com/nektos/act/pull/1375 From 03f664e45e40bf4e092a63a267229d36b6a0d5e3 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Tue, 11 Oct 2022 16:12:26 +0200 Subject: [PATCH 188/338] chore: add patch --- patches | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches b/patches index f635e4174b7..cbea87a48e5 100644 --- a/patches +++ b/patches @@ -6,3 +6,5 @@ https://github.com/xing/act/pull/22 # ------------------------------------------- # test: add test for networking setup in act https://github.com/nektos/act/pull/1375 +# fix: re-evaluate env for remote composite actions +https://github.com/nektos/act/pull/1385 From 38062a9f42db3fc98ae8fd817991a17c717c06c4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 13 Oct 2022 05:31:33 +0000 Subject: [PATCH 189/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 4541139109f..ff5e2898041 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 4541139109f2838bcac25ddd3d435a5c0661bf25 +Subproject commit ff5e2898041230978cef9af37dd87c09b07a77e8 From d1ab620e42bc972a24db716967c433c678e0475f Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 18 Oct 2022 05:33:24 +0000 Subject: [PATCH 190/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index ff5e2898041..37f5b7f4a2b 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit ff5e2898041230978cef9af37dd87c09b07a77e8 +Subproject commit 37f5b7f4a2bc363be670ee65f623c6b54ec9d8c5 From c7911bde959b409f4be78f539840bb4f00100610 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 19 Oct 2022 05:34:06 +0000 Subject: [PATCH 191/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 37f5b7f4a2b..bc173710179 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 37f5b7f4a2bc363be670ee65f623c6b54ec9d8c5 +Subproject commit bc1737101793f711ee3f4af48304a071603dad7f From f12f4c5830d0e73322b9cf9f9d72dc427b85597d Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 24 Oct 2022 05:33:08 +0000 Subject: [PATCH 192/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index bc173710179..e81dc0d295a 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit bc1737101793f711ee3f4af48304a071603dad7f +Subproject commit e81dc0d295ad58d13927e61c91d3c4b4a6def942 From b92b280ca6fdc19e4fa9d20523df14fde9fd6358 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Mon, 24 Oct 2022 10:37:51 +0200 Subject: [PATCH 193/338] chore: remove patches which are already merged upstream --- patches | 4 ---- 1 file changed, 4 deletions(-) diff --git a/patches b/patches index cbea87a48e5..c4fc93da9d9 100644 --- a/patches +++ b/patches @@ -4,7 +4,3 @@ https://github.com/xing/act/pull/23 # customize goreleaser configuration https://github.com/xing/act/pull/22 # ------------------------------------------- -# test: add test for networking setup in act -https://github.com/nektos/act/pull/1375 -# fix: re-evaluate env for remote composite actions -https://github.com/nektos/act/pull/1385 From 82e6a70bb2e703979e3a48b8b429be4c259e46c0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 30 Oct 2022 05:11:19 +0000 Subject: [PATCH 194/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index e81dc0d295a..2f1c5a19f12 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit e81dc0d295ad58d13927e61c91d3c4b4a6def942 +Subproject commit 2f1c5a19f12ad0fc784924b4585d4ace061c7ef5 From b38e2ff7032158f17094855bccc2b78a40a5808a Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 31 Oct 2022 05:15:34 +0000 Subject: [PATCH 195/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 2f1c5a19f12..a9298d936c5 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 2f1c5a19f12ad0fc784924b4585d4ace061c7ef5 +Subproject commit a9298d936c5265461dd8f6322961232b08fc6d12 From b2e7ae0f3d2ed3aa41acf815e24a1b564cd91edc Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 2 Nov 2022 05:20:53 +0000 Subject: [PATCH 196/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index a9298d936c5..9b95a728d84 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit a9298d936c5265461dd8f6322961232b08fc6d12 +Subproject commit 9b95a728d84920a75d22c0dc6088391fbbc4002a From 65d53e4e8704c3b4f4825062ee01f6e171941042 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 7 Nov 2022 05:11:07 +0000 Subject: [PATCH 197/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 9b95a728d84..c2329815b8b 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 9b95a728d84920a75d22c0dc6088391fbbc4002a +Subproject commit c2329815b8bbc739043e1584e465322a602475e9 From 6de0076a970e71db1f6ecf2a00baf733a8ece668 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Mon, 7 Nov 2022 16:17:47 +0100 Subject: [PATCH 198/338] chore: add upstream patch --- patches | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches b/patches index c4fc93da9d9..2007e5b2bab 100644 --- a/patches +++ b/patches @@ -4,3 +4,5 @@ https://github.com/xing/act/pull/23 # customize goreleaser configuration https://github.com/xing/act/pull/22 # ------------------------------------------- +# fix: keep path to event json file in composite actions +https://github.com/nektos/act/pull/1428 From a0e42633638e5ae49d8c5eff692154107b22d263 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 9 Nov 2022 05:14:06 +0000 Subject: [PATCH 199/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index c2329815b8b..cf00e8d9bb2 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit c2329815b8bbc739043e1584e465322a602475e9 +Subproject commit cf00e8d9bb288938d801bbea283c9b977a36ef1d From b526021b548384dc501a5e452eeef8821c986ad6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 7 Nov 2022 15:45:40 +0000 Subject: [PATCH 200/338] chore(deps): add renovate.json --- renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 00000000000..39a2b6e9a55 --- /dev/null +++ b/renovate.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:base" + ] +} From 7cda45c9d2f7e86ef552cf9f2b28ed56956cfcd6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 09:36:44 +0000 Subject: [PATCH 201/338] chore(deps): update actions/cache action to v3 --- .github/workflows/build-with-patches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index b8f5cfdd9fc..fd0890ab8ae 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -59,7 +59,7 @@ jobs: with: go-version: ${{ env.GO_VERSION }} - uses: docker/setup-qemu-action@v1 - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} From b586b74ad039af9ee213fc86d10f4f4c347841e6 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Wed, 9 Nov 2022 10:34:38 +0100 Subject: [PATCH 202/338] chore: add patch --- patches | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches b/patches index 2007e5b2bab..70db8b1e759 100644 --- a/patches +++ b/patches @@ -6,3 +6,5 @@ https://github.com/xing/act/pull/22 # ------------------------------------------- # fix: keep path to event json file in composite actions https://github.com/nektos/act/pull/1428 +# feat: interpolate the step names +https://github.com/nektos/act/pull/1422 From 4f25ccd43cc235e6307a8b2de403f323c82b9fa5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 11 Nov 2022 05:09:03 +0000 Subject: [PATCH 203/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index cf00e8d9bb2..d97481d5671 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit cf00e8d9bb288938d801bbea283c9b977a36ef1d +Subproject commit d97481d5671a4906b8b9fe7b951333fa938ffe2b From 78dfcd8555922a0717827a8f843745daa39ef811 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 14 Nov 2022 05:09:17 +0000 Subject: [PATCH 204/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index d97481d5671..1b554aeff65 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit d97481d5671a4906b8b9fe7b951333fa938ffe2b +Subproject commit 1b554aeff651cf801c11277bacb162ba31483b08 From 820e2863f877e7db04a2e4b3a0376bae704660cc Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 17 Nov 2022 05:05:01 +0000 Subject: [PATCH 205/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 1b554aeff65..a108f10ccc0 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 1b554aeff651cf801c11277bacb162ba31483b08 +Subproject commit a108f10ccc056bc10bfcfeeec6978dc3c14f2d6e From 595716386935b0907817431dc2b8d88541c52272 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Fri, 18 Nov 2022 11:38:04 +0100 Subject: [PATCH 206/338] chore: remove patches Both patches have been merged upstream --- patches | 4 ---- 1 file changed, 4 deletions(-) diff --git a/patches b/patches index 70db8b1e759..c4fc93da9d9 100644 --- a/patches +++ b/patches @@ -4,7 +4,3 @@ https://github.com/xing/act/pull/23 # customize goreleaser configuration https://github.com/xing/act/pull/22 # ------------------------------------------- -# fix: keep path to event json file in composite actions -https://github.com/nektos/act/pull/1428 -# feat: interpolate the step names -https://github.com/nektos/act/pull/1422 From dfba1b311b24240a381e89efc10a8bab7cb3c7bb Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 22 Nov 2022 05:04:51 +0000 Subject: [PATCH 207/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index a108f10ccc0..5200c491555 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit a108f10ccc056bc10bfcfeeec6978dc3c14f2d6e +Subproject commit 5200c491555ab1665cf280523f97bf92401c0415 From f9008fb0c763b0c0c967d00dc31838cf70dcd056 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 23 Nov 2022 05:04:44 +0000 Subject: [PATCH 208/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 5200c491555..ccb3b0e8757 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 5200c491555ab1665cf280523f97bf92401c0415 +Subproject commit ccb3b0e8757158bb945cf9d3b12a4a9299eea9c4 From 6fe5b6fbffa016865832900e1981ed6be52e5804 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 24 Nov 2022 05:04:40 +0000 Subject: [PATCH 209/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index ccb3b0e8757..3553b2697c1 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit ccb3b0e8757158bb945cf9d3b12a4a9299eea9c4 +Subproject commit 3553b2697c196bab5d7e20eb9ce66d40a205fb1a From 737fecf1219eb7d6f973218fd4e01fe96de72f04 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 26 Nov 2022 05:04:31 +0000 Subject: [PATCH 210/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 3553b2697c1..87327286d51 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 3553b2697c196bab5d7e20eb9ce66d40a205fb1a +Subproject commit 87327286d51e8f776e27baadb1eafc3b5382c7f1 From b38376949e52edf167daada8d48ac7aa6fed28a0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 28 Nov 2022 05:05:06 +0000 Subject: [PATCH 211/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 87327286d51..7754ba7fcf3 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 87327286d51e8f776e27baadb1eafc3b5382c7f1 +Subproject commit 7754ba7fcf3f80b76bb4d7cf1edbe5935c8a6bdc From 7e7829c9d402dd4f8ab3ce23ffdaf2caecf58e81 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 7 Dec 2022 05:04:38 +0000 Subject: [PATCH 212/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 7754ba7fcf3..8c5748a55c6 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 7754ba7fcf3f80b76bb4d7cf1edbe5935c8a6bdc +Subproject commit 8c5748a55c6190ba34354ca29fdb473e5d3724a1 From 70cd64800cbf4379ddaa478d110f22def82bcd50 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 8 Dec 2022 05:04:51 +0000 Subject: [PATCH 213/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 8c5748a55c6..0f8861b9e37 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 8c5748a55c6190ba34354ca29fdb473e5d3724a1 +Subproject commit 0f8861b9e37bfdf5e0fabb188d03365c0401823a From 66893ecdf49327799ed00f6404cda05103a323b9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 10 Dec 2022 05:04:42 +0000 Subject: [PATCH 214/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 0f8861b9e37..d281230ccef 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 0f8861b9e37bfdf5e0fabb188d03365c0401823a +Subproject commit d281230ccef6438085180866e50a026025a05f67 From 968530d0097f68c4daae5e14f9b0a878028b7537 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 16 Dec 2022 05:04:47 +0000 Subject: [PATCH 215/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index d281230ccef..0c8c082ac0b 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit d281230ccef6438085180866e50a026025a05f67 +Subproject commit 0c8c082ac0baf25909fd79b87897426816c3c4eb From f3bac1042a1ea67047dd52b84c6171a8c01c6441 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 20 Dec 2022 05:04:48 +0000 Subject: [PATCH 216/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 0c8c082ac0b..4989f444f10 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 0c8c082ac0baf25909fd79b87897426816c3c4eb +Subproject commit 4989f444f1085ac0ec6b9bc35de92dc22f3c9f5d From b018983ab37349ca0086f66c714e0869291a3f87 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Tue, 20 Dec 2022 14:34:43 +0100 Subject: [PATCH 217/338] chore: increase test timeout --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 766d7634efe..24d9bf44e10 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ act-build: patch .PHONY: act-test act-test: patch - cd act && go test -v ./... + cd act && go test -v -timeout 15m ./... .PHONY: clean clean: From 7f2a5a6e142d55647021e5fea1a5d4b1ac44ccba Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Tue, 20 Dec 2022 15:59:19 +0100 Subject: [PATCH 218/338] chore: add patches - upstream fix for for matrix builds - support remote reusable workflows --- patches | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/patches b/patches index c4fc93da9d9..7a3bd36b3b5 100644 --- a/patches +++ b/patches @@ -4,3 +4,9 @@ https://github.com/xing/act/pull/23 # customize goreleaser configuration https://github.com/xing/act/pull/22 # ------------------------------------------- +# fix: preserve job result state in case of failure +https://github.com/nektos/act/pull/1519 +# Patches for reusable workflows (not yet merged by upstream) +https://github.com/nektos/act/pull/1520 +https://github.com/nektos/act/pull/1521 +https://github.com/nektos/act/pull/1525 \ No newline at end of file From e6d38c349c5b87dcec2e76f59d0f82fcf6dba4a3 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Wed, 21 Dec 2022 09:13:45 +0100 Subject: [PATCH 219/338] chore: add patch to fix paths issues --- patches | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/patches b/patches index 7a3bd36b3b5..47a62355bd8 100644 --- a/patches +++ b/patches @@ -9,4 +9,6 @@ https://github.com/nektos/act/pull/1519 # Patches for reusable workflows (not yet merged by upstream) https://github.com/nektos/act/pull/1520 https://github.com/nektos/act/pull/1521 -https://github.com/nektos/act/pull/1525 \ No newline at end of file +https://github.com/nektos/act/pull/1525 +# fix: extra path lost in composite actions +https://github.com/nektos/act/pull/1531 \ No newline at end of file From db79911f34163309b08a48821641253412d9a0ac Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Wed, 21 Dec 2022 09:56:30 +0100 Subject: [PATCH 220/338] chore: add newline --- patches | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches b/patches index 47a62355bd8..539f1500c65 100644 --- a/patches +++ b/patches @@ -11,4 +11,4 @@ https://github.com/nektos/act/pull/1520 https://github.com/nektos/act/pull/1521 https://github.com/nektos/act/pull/1525 # fix: extra path lost in composite actions -https://github.com/nektos/act/pull/1531 \ No newline at end of file +https://github.com/nektos/act/pull/1531 From 2d3371de199175173b2c80be6236cffa4a3cc5e8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 26 Dec 2022 05:04:45 +0000 Subject: [PATCH 221/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 4989f444f10..e3a722e7c6c 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 4989f444f1085ac0ec6b9bc35de92dc22f3c9f5d +Subproject commit e3a722e7c6c697a1b0a38aa314bfb227da4deb5f From 38f10ce0970ecca862cd9e0315b70197a4287810 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 2 Jan 2023 05:04:48 +0000 Subject: [PATCH 222/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index e3a722e7c6c..cfc1b91aa11 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit e3a722e7c6c697a1b0a38aa314bfb227da4deb5f +Subproject commit cfc1b91aa11220f102470622cacd105cedd931c9 From 6760bcea75fd8b7af290067865c87e868c626356 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 11 Jan 2023 05:04:47 +0000 Subject: [PATCH 223/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index cfc1b91aa11..3ac756b37a4 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit cfc1b91aa11220f102470622cacd105cedd931c9 +Subproject commit 3ac756b37a496020ec8bb7b5852272d01c471057 From 23356cf1f96c4b681e6fdc8495a671b740e435f4 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Thu, 12 Jan 2023 07:33:02 +0100 Subject: [PATCH 224/338] chore: remove patches applied upstream --- patches | 4 ---- 1 file changed, 4 deletions(-) diff --git a/patches b/patches index 539f1500c65..4da2f3e406e 100644 --- a/patches +++ b/patches @@ -4,11 +4,7 @@ https://github.com/xing/act/pull/23 # customize goreleaser configuration https://github.com/xing/act/pull/22 # ------------------------------------------- -# fix: preserve job result state in case of failure -https://github.com/nektos/act/pull/1519 # Patches for reusable workflows (not yet merged by upstream) https://github.com/nektos/act/pull/1520 https://github.com/nektos/act/pull/1521 https://github.com/nektos/act/pull/1525 -# fix: extra path lost in composite actions -https://github.com/nektos/act/pull/1531 From 43eed565bbddc577f288c8671258732f3d5649cf Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 13 Jan 2023 05:04:42 +0000 Subject: [PATCH 225/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 3ac756b37a4..3f3b25ae84a 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 3ac756b37a496020ec8bb7b5852272d01c471057 +Subproject commit 3f3b25ae84a25f8488f3801e3342bb3f96c6cd8a From 1499234e65e9a5a55ab428fea3febd9c53bc0fa1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 14 Jan 2023 05:04:35 +0000 Subject: [PATCH 226/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 3f3b25ae84a..767e6a8696e 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 3f3b25ae84a25f8488f3801e3342bb3f96c6cd8a +Subproject commit 767e6a8696e252e2524d1f29aff86e8d52abd937 From b22dd9a5a9de7f3701516e426c5f1302bd01a354 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 16 Jan 2023 05:04:51 +0000 Subject: [PATCH 227/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 767e6a8696e..93907931df7 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 767e6a8696e252e2524d1f29aff86e8d52abd937 +Subproject commit 93907931df737bdd21ecc624f4983fb1b365357a From 367a74c8fa3da0d1dff22f65fee897aa9dc71bf3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 17 Jan 2023 05:04:43 +0000 Subject: [PATCH 228/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 93907931df7..3e23b4fbb55 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 93907931df737bdd21ecc624f4983fb1b365357a +Subproject commit 3e23b4fbb558bc4e8bdc72d4f75e0d94e5be3bf1 From b7aceec3904c045da6bc509acce1b5410645a5fa Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 20 Jan 2023 05:04:46 +0000 Subject: [PATCH 229/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 3e23b4fbb55..82a8c1e80df 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 3e23b4fbb558bc4e8bdc72d4f75e0d94e5be3bf1 +Subproject commit 82a8c1e80dfcd73842bc0359ca8447303b6fcc08 From 5cca79f7819f0d55f3c21d5390d47c6a9269c33c Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 21 Jan 2023 05:04:40 +0000 Subject: [PATCH 230/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 82a8c1e80df..7ada9d3f74f 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 82a8c1e80dfcd73842bc0359ca8447303b6fcc08 +Subproject commit 7ada9d3f74f4d8705ba01ce110f3d611989dd442 From 2e229f4ad563b8d9949e81e0858706f90d973771 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 23 Jan 2023 05:04:38 +0000 Subject: [PATCH 231/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 7ada9d3f74f..09e9f6a1ac0 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 7ada9d3f74f4d8705ba01ce110f3d611989dd442 +Subproject commit 09e9f6a1ac00592b0341d73d6c642dd4aeb83a02 From 9913919b88071286d46f12ff32414c25cb7012d9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 26 Jan 2023 05:04:51 +0000 Subject: [PATCH 232/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 09e9f6a1ac0..932863bef50 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 09e9f6a1ac00592b0341d73d6c642dd4aeb83a02 +Subproject commit 932863bef508868168954ef69572750cf87f463f From e448782026a22412fc0a32e12b25702249846793 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 30 Jan 2023 05:04:50 +0000 Subject: [PATCH 233/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 932863bef50..e259dc2835b 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 932863bef508868168954ef69572750cf87f463f +Subproject commit e259dc2835b6b759de7f4dea2daa490438f41bbe From c86a2c51c7846ea63f2948d5797e13580cd12236 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 1 Feb 2023 05:04:46 +0000 Subject: [PATCH 234/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index e259dc2835b..787388daf54 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit e259dc2835b6b759de7f4dea2daa490438f41bbe +Subproject commit 787388daf54f3d78c56da29a37062b019e10e84f From 26a07162cfabf63c595c89bbc2f882dca2864677 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Wed, 1 Feb 2023 09:50:19 +0100 Subject: [PATCH 235/338] chore: update upstream patches --- patches | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches b/patches index 4da2f3e406e..f1bd0144fcb 100644 --- a/patches +++ b/patches @@ -5,6 +5,4 @@ https://github.com/xing/act/pull/23 https://github.com/xing/act/pull/22 # ------------------------------------------- # Patches for reusable workflows (not yet merged by upstream) -https://github.com/nektos/act/pull/1520 https://github.com/nektos/act/pull/1521 -https://github.com/nektos/act/pull/1525 From 64d342f0e7a66b4d6447a4cc6934598e6c05d543 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 10 Nov 2022 10:43:38 +0000 Subject: [PATCH 236/338] chore(deps): update docker/setup-qemu-action action to v2 --- .github/workflows/build-with-patches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index fd0890ab8ae..c12c3b892db 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -58,7 +58,7 @@ jobs: - uses: actions/setup-go@v2 with: go-version: ${{ env.GO_VERSION }} - - uses: docker/setup-qemu-action@v1 + - uses: docker/setup-qemu-action@v2 - uses: actions/cache@v3 with: path: ~/go/pkg/mod From 6c967339d1b0acd91093e0fa1eea71245672b881 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 09:36:51 +0000 Subject: [PATCH 237/338] chore(deps): update actions/checkout action to v3 --- .github/workflows/build-with-patches.yml | 8 ++++---- .github/workflows/sync-upstream.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index c12c3b892db..9a8bc522632 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -13,7 +13,7 @@ jobs: latestHash: ${{ steps.release-tag.outputs.latestHash }} tag: ${{ steps.release-tag.outputs.tag }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 submodules: true @@ -27,7 +27,7 @@ jobs: needs: [calculate-tag] if: needs.calculate-tag.outputs.versionHash != needs.calculate-tag.outputs.latestHash steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true fetch-depth: 0 @@ -47,7 +47,7 @@ jobs: needs: [calculate-tag] if: needs.calculate-tag.outputs.versionHash != needs.calculate-tag.outputs.latestHash steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true fetch-depth: 0 @@ -73,7 +73,7 @@ jobs: needs: ["calculate-tag", "build", "test"] if: github.ref == 'refs/heads/distribution' && needs.calculate-tag.outputs.versionHash != needs.calculate-tag.outputs.latestHash steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 submodules: true diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml index 0e857d6c5ad..25341cab6ac 100644 --- a/.github/workflows/sync-upstream.yml +++ b/.github/workflows/sync-upstream.yml @@ -16,7 +16,7 @@ jobs: application_id: ${{ secrets.XING_ACTIONS_APP_ID }} application_private_key: ${{ secrets.XING_ACTIONS_PRIVATE_KEY }} permissions: "contents:write,workflows:write" - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 name: Reset xing/act#master to latest nektos/act#master with: ref: master @@ -28,7 +28,7 @@ jobs: git fetch upstream git reset --hard upstream/master git push --follow-tags --force origin master - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 name: Update act submodule and push to xing/act#distribution with: ref: distribution From 13dfbc6829fe4bf54f850fa850ca48a8729cd559 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 12:23:52 +0000 Subject: [PATCH 238/338] chore(deps): update actions/setup-go action to v3 --- .github/workflows/build-with-patches.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index 9a8bc522632..051ab6428a6 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -35,7 +35,7 @@ jobs: run: | git config --global user.name github-actions git config --global user.email github-actions@github.com - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v3 with: go-version: ${{ env.GO_VERSION }} - name: compile @@ -55,7 +55,7 @@ jobs: run: | git config --global user.name github-actions git config --global user.email github-actions@github.com - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v3 with: go-version: ${{ env.GO_VERSION }} - uses: docker/setup-qemu-action@v2 @@ -93,7 +93,7 @@ jobs: cd act git tag -d "${{ needs.calculate-tag.outputs.tag }}" || true git tag "${{ needs.calculate-tag.outputs.tag }}" - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v3 with: go-version: ${{ env.GO_VERSION }} - name: GoReleaser From 5af5d750f939831698cc5473880ae8f06f60658f Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 2 Feb 2023 05:04:35 +0000 Subject: [PATCH 239/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 787388daf54..72d03214c5e 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 787388daf54f3d78c56da29a37062b019e10e84f +Subproject commit 72d03214c5ed8985bf23dc15440fa5301e9d13bf From c3d8c5cb521bcd4aef09c0987e23f5322097df8b Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 3 Feb 2023 05:04:42 +0000 Subject: [PATCH 240/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 72d03214c5e..f91b2aa5dbc 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 72d03214c5ed8985bf23dc15440fa5301e9d13bf +Subproject commit f91b2aa5dbcb16075f49c96a6108d0d418382f4d From 64f4885b6198b5321a9b6ee2923475ace298be37 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 4 Feb 2023 05:04:41 +0000 Subject: [PATCH 241/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index f91b2aa5dbc..24c16fbf255 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit f91b2aa5dbcb16075f49c96a6108d0d418382f4d +Subproject commit 24c16fbf2554a472c7ec088f58de42aaa78f7767 From be5c80297ff63556f2712c62cb2bb40b32899bb7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 5 Feb 2023 05:04:40 +0000 Subject: [PATCH 242/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 24c16fbf255..e775fea2655 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 24c16fbf2554a472c7ec088f58de42aaa78f7767 +Subproject commit e775fea2655d9e3342bd06c2743cb4bab791e2ab From 0c975ba2a9a06ff6e41f99af2591d96b87e6a811 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 6 Feb 2023 05:04:55 +0000 Subject: [PATCH 243/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index e775fea2655..f41e9127a8e 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit e775fea2655d9e3342bd06c2743cb4bab791e2ab +Subproject commit f41e9127a8e4516e5d78d58702d00c55de1a6b96 From 6e8f0c59b1244d8911be426c5da4976bb3667245 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 7 Feb 2023 05:04:45 +0000 Subject: [PATCH 244/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index f41e9127a8e..36dbbc1dfa0 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit f41e9127a8e4516e5d78d58702d00c55de1a6b96 +Subproject commit 36dbbc1dfa049676e17e1f4712c6b918ce4ce5b7 From 1e200d01384f14ccf96d4081b92e754f16fb7389 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 9 Feb 2023 05:04:43 +0000 Subject: [PATCH 245/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 36dbbc1dfa0..44333c758a9 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 36dbbc1dfa049676e17e1f4712c6b918ce4ce5b7 +Subproject commit 44333c758a9590666c1b5214c0bfc48b7d8fd290 From 23b2f17d730eebcb7188217fcf52bb85f038e460 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 12 Feb 2023 05:04:34 +0000 Subject: [PATCH 246/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 44333c758a9..c378a7d28b5 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 44333c758a9590666c1b5214c0bfc48b7d8fd290 +Subproject commit c378a7d28b5c20de9fbb4456544329d04ffb62a4 From 5a379d65f38d3cc30eed8cb25383fcdec35aa02e Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 13 Feb 2023 05:04:55 +0000 Subject: [PATCH 247/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index c378a7d28b5..8048baf4356 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit c378a7d28b5c20de9fbb4456544329d04ffb62a4 +Subproject commit 8048baf435665cb3293f593a06526dfff1691b54 From 1d99c019290b109c6b45239d85fb2c8560cbbd0c Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 14 Feb 2023 05:04:57 +0000 Subject: [PATCH 248/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 8048baf4356..34ab8150bf8 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 8048baf435665cb3293f593a06526dfff1691b54 +Subproject commit 34ab8150bf8b438964b7e52796f2123466e0cf76 From 6dc5289336f0557455f15930479fa7a36f1642d4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 17 Feb 2023 05:04:57 +0000 Subject: [PATCH 249/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 34ab8150bf8..be4a1477a5b 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 34ab8150bf8b438964b7e52796f2123466e0cf76 +Subproject commit be4a1477a5b73b3e17f79891ec6147413acb4df7 From 9dc94ba48a25a19bc5951fd164e258b53a5d2350 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 20 Feb 2023 05:04:45 +0000 Subject: [PATCH 250/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index be4a1477a5b..b7a9eb9fbf8 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit be4a1477a5b73b3e17f79891ec6147413acb4df7 +Subproject commit b7a9eb9fbf86da76cbad35296ff11b64ee416d18 From 1f6cb6aa909c32504278fe063d7d42355401e400 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 24 Feb 2023 05:04:54 +0000 Subject: [PATCH 251/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index b7a9eb9fbf8..89cb5585580 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit b7a9eb9fbf86da76cbad35296ff11b64ee416d18 +Subproject commit 89cb55855802fd7997bf9128140ee4e48b7e89c1 From 99e01d8a0890a2419e3ad968878a0cca58d8a0b7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 27 Feb 2023 05:04:47 +0000 Subject: [PATCH 252/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 89cb5585580..04d12b0206a 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 89cb55855802fd7997bf9128140ee4e48b7e89c1 +Subproject commit 04d12b0206a62cc48a765ed29f2a1ad732d33b3b From 0012898d850b3b8309ccfe8d5509988d2d4949aa Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 28 Feb 2023 05:05:05 +0000 Subject: [PATCH 253/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 04d12b0206a..5500c928ebb 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 04d12b0206a62cc48a765ed29f2a1ad732d33b3b +Subproject commit 5500c928ebb6c4e7dcfb37c29c7100dd7e721b68 From ca5d1037a9993bf9a4c3ec054482e254ed9ec44c Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 1 Mar 2023 05:04:43 +0000 Subject: [PATCH 254/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 5500c928ebb..44b510f48ca 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 5500c928ebb6c4e7dcfb37c29c7100dd7e721b68 +Subproject commit 44b510f48cac6a58654bf920ee26cc6e1d36ac3a From a7643533e786f58e4f9d68b25cd99153c42e72ab Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 4 Mar 2023 05:04:44 +0000 Subject: [PATCH 255/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 44b510f48ca..6601d8d8e8d 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 44b510f48cac6a58654bf920ee26cc6e1d36ac3a +Subproject commit 6601d8d8e8d19d5461153f7a63658a1277da3f1f From b266ab5e10d929f4985ac1db3725da61b0e385db Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 6 Mar 2023 05:04:57 +0000 Subject: [PATCH 256/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 6601d8d8e8d..7ee21384188 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 6601d8d8e8d19d5461153f7a63658a1277da3f1f +Subproject commit 7ee2138418822460ed576391201db55803bd7069 From 5da88e0a05d48a9826dbd5953ee567ec4f2c468c Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 8 Mar 2023 05:04:40 +0000 Subject: [PATCH 257/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 7ee21384188..aeee2052de4 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 7ee2138418822460ed576391201db55803bd7069 +Subproject commit aeee2052de45b3ceff3fb66d3eff461379b89d92 From dd9e85e87f7887958531f1af08006890bb807fc5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 9 Mar 2023 05:04:52 +0000 Subject: [PATCH 258/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index aeee2052de4..ac5dd8feb87 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit aeee2052de45b3ceff3fb66d3eff461379b89d92 +Subproject commit ac5dd8feb876d37ae483376a137c57383577dace From 348cc3a0e8cf269e30ec544a87915ec344ccd0cd Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Thu, 9 Mar 2023 14:16:15 +0100 Subject: [PATCH 259/338] chore: remove patches All patches are applied upstream already. --- patches | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches b/patches index f1bd0144fcb..c4fc93da9d9 100644 --- a/patches +++ b/patches @@ -4,5 +4,3 @@ https://github.com/xing/act/pull/23 # customize goreleaser configuration https://github.com/xing/act/pull/22 # ------------------------------------------- -# Patches for reusable workflows (not yet merged by upstream) -https://github.com/nektos/act/pull/1521 From d6063ea673af4066867698a883b31abe866c5618 Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Thu, 9 Mar 2023 15:34:18 +0100 Subject: [PATCH 260/338] chore: add patch until upstream merges --- patches | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches b/patches index c4fc93da9d9..b4331370d9b 100644 --- a/patches +++ b/patches @@ -4,3 +4,5 @@ https://github.com/xing/act/pull/23 # customize goreleaser configuration https://github.com/xing/act/pull/22 # ------------------------------------------- +# fix: correct ref and ref_name +https://github.com/nektos/act/pull/1672 From d5b2121c3c310b961e5372777883fff5a68e3345 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 10 Mar 2023 05:05:04 +0000 Subject: [PATCH 261/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index ac5dd8feb87..6744e68ee29 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit ac5dd8feb876d37ae483376a137c57383577dace +Subproject commit 6744e68ee29d3bcb6878f895d6ccb5f9f8e2c478 From 1374ab1950462cb16ef0d50548d106fde267d849 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 15 Mar 2023 05:04:58 +0000 Subject: [PATCH 262/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 6744e68ee29..09de42f0674 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 6744e68ee29d3bcb6878f895d6ccb5f9f8e2c478 +Subproject commit 09de42f067404a2f9dd904f3620812bf40a562bb From 156f6aea86530174b1be4c966af3b93fbb83385f Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 20 Mar 2023 05:04:57 +0000 Subject: [PATCH 263/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 09de42f0674..9fab59954c9 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 09de42f067404a2f9dd904f3620812bf40a562bb +Subproject commit 9fab59954c9a3cd10af53dfa6af0e114a5ef9470 From 2923b06e3f907aab2d735c7a186aa2bdccef18e7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 27 Mar 2023 05:04:51 +0000 Subject: [PATCH 264/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 9fab59954c9..351ae99bc1b 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 9fab59954c9a3cd10af53dfa6af0e114a5ef9470 +Subproject commit 351ae99bc1b205c61b02d4fb04c06f8287b57f9f From 8c6e69f696b346ce5c5e0f7691938f1a6bff09b0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 29 Mar 2023 05:04:41 +0000 Subject: [PATCH 265/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 351ae99bc1b..75ffa205c4d 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 351ae99bc1b205c61b02d4fb04c06f8287b57f9f +Subproject commit 75ffa205c4dc02b1b8a57d247694a357ea9e1495 From fa69e480ca118eabc83ab942e723896eca1aeb96 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 1 Apr 2023 05:04:38 +0000 Subject: [PATCH 266/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 75ffa205c4d..220d6f1251a 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 75ffa205c4dc02b1b8a57d247694a357ea9e1495 +Subproject commit 220d6f1251aea75c378e5a98546f43cd918e1892 From 3fe3118a8471f768d99f49b9f707be51c2aa54e5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 3 Apr 2023 05:04:41 +0000 Subject: [PATCH 267/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 220d6f1251a..68c72b9a51f 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 220d6f1251aea75c378e5a98546f43cd918e1892 +Subproject commit 68c72b9a51f4fa586af62619f9e6361e023a5d48 From b85ec13dba40f3fd3c1db82fe6f17e70a5d8f36b Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 9 Apr 2023 05:04:39 +0000 Subject: [PATCH 268/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 68c72b9a51f..24b04dfa55e 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 68c72b9a51f4fa586af62619f9e6361e023a5d48 +Subproject commit 24b04dfa55ebd31c7b4f2fb114350d14783a533a From b6f28a854e1801ffe743b267a3c67b23fecd5c5d Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 10 Apr 2023 05:05:07 +0000 Subject: [PATCH 269/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 24b04dfa55e..f2bd194c7fa 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 24b04dfa55ebd31c7b4f2fb114350d14783a533a +Subproject commit f2bd194c7fa282fb35f31bcafe9bf1875da71fc7 From cdf2c9d0f0e0946278cf9084ddb4579275d39843 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 11 Apr 2023 05:04:38 +0000 Subject: [PATCH 270/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index f2bd194c7fa..65a925b4ed5 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit f2bd194c7fa282fb35f31bcafe9bf1875da71fc7 +Subproject commit 65a925b4ed5f0bebab9314433fcfdac4018482ac From aa62d14cf98ab7fd9d8bb560412d4aa22d1ddc70 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 12 Apr 2023 05:04:40 +0000 Subject: [PATCH 271/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 65a925b4ed5..148a5450216 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 65a925b4ed5f0bebab9314433fcfdac4018482ac +Subproject commit 148a54502167880f90dbf2f68ff44478679f41dd From c0addbb89eab57bb02c5260a25d6a247088e0d4b Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 14 Apr 2023 05:04:31 +0000 Subject: [PATCH 272/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 148a5450216..97749a27b94 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 148a54502167880f90dbf2f68ff44478679f41dd +Subproject commit 97749a27b948268a921ef3e75d679a0f1f5c26ce From d9319f4972c59d69e4dbf9a5c5719d92effd391a Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 17 Apr 2023 05:04:43 +0000 Subject: [PATCH 273/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 97749a27b94..6d527bf1a35 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 97749a27b948268a921ef3e75d679a0f1f5c26ce +Subproject commit 6d527bf1a356b69ee4ee35e43159c9d0a21c7718 From 179a091e94d596a7870e0d1c8b8b3e18978e1e2b Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 19 Apr 2023 05:04:50 +0000 Subject: [PATCH 274/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 6d527bf1a35..37152664940 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 6d527bf1a356b69ee4ee35e43159c9d0a21c7718 +Subproject commit 37152664940eea09a6775daf5eff8ee0d7f31442 From 0c4ccd5d6bc3ecd5bca8ed641ca1778bf55e0e27 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 24 Apr 2023 05:04:46 +0000 Subject: [PATCH 275/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 37152664940..2ea78917879 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 37152664940eea09a6775daf5eff8ee0d7f31442 +Subproject commit 2ea78917879854128154124d3b7c8fa8d552e6e8 From 3d8881ae67808cc0aa2239e650bc1205113c0af3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 25 Apr 2023 05:04:42 +0000 Subject: [PATCH 276/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 2ea78917879..baf3bcf48b1 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 2ea78917879854128154124d3b7c8fa8d552e6e8 +Subproject commit baf3bcf48b1c30c83341f9f327343f9623e44c50 From 9fe5cdd5b89a6dc5aec06b69869ab93219b47c5a Mon Sep 17 00:00:00 2001 From: Markus Wolf Date: Tue, 25 Apr 2023 11:29:14 +0200 Subject: [PATCH 277/338] chore: update upstream patches Removed a patch which was merged upstream and added a patch to restore docker socket handling. --- patches | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches b/patches index b4331370d9b..ee9d2476d51 100644 --- a/patches +++ b/patches @@ -4,5 +4,5 @@ https://github.com/xing/act/pull/23 # customize goreleaser configuration https://github.com/xing/act/pull/22 # ------------------------------------------- -# fix: correct ref and ref_name -https://github.com/nektos/act/pull/1672 +# Revert breaking docker socket changes +https://github.com/nektos/act/pull/1763 From b8606bc4bea748d5977d32107274d76859718f73 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 26 Apr 2023 05:04:54 +0000 Subject: [PATCH 278/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index baf3bcf48b1..c81a770bc5f 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit baf3bcf48b1c30c83341f9f327343f9623e44c50 +Subproject commit c81a770bc5f8041c2c169e227996ea34ae62ec48 From a60c8a498f496e712cdf0529e865b6fb8ae8a663 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 29 Apr 2023 05:04:39 +0000 Subject: [PATCH 279/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index c81a770bc5f..d77991c95ab 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit c81a770bc5f8041c2c169e227996ea34ae62ec48 +Subproject commit d77991c95ab6eb357b9327163ac9ceca3d04ce9b From 4bbf200ab92da6e2015e3262d49f07b0d8441222 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 1 May 2023 05:05:22 +0000 Subject: [PATCH 280/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index d77991c95ab..3eb6e83ea4c 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit d77991c95ab6eb357b9327163ac9ceca3d04ce9b +Subproject commit 3eb6e83ea4c589a0dfcb2a17e93a04c23909f770 From ce3da27734317cd6c87912ec9b0069a77134d453 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 4 May 2023 05:04:50 +0000 Subject: [PATCH 281/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 3eb6e83ea4c..f84a566ded8 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 3eb6e83ea4c589a0dfcb2a17e93a04c23909f770 +Subproject commit f84a566ded8d03bc4daee36bb7df2502a8351409 From 294172d804cf4f40837a85ad0c7d6d7470dd54ec Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 8 May 2023 05:05:12 +0000 Subject: [PATCH 282/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index f84a566ded8..65ef31f102c 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit f84a566ded8d03bc4daee36bb7df2502a8351409 +Subproject commit 65ef31f102ceb75623973921099454637bab55b0 From a5e6467384f05ad7d9747a5fdf79bd94b7b55246 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 12 May 2023 05:04:46 +0000 Subject: [PATCH 283/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 65ef31f102c..b5fa24537f7 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 65ef31f102ceb75623973921099454637bab55b0 +Subproject commit b5fa24537f70e88166c7e43d45b5f6ff41d0b12d From 822b316c8a18249a74506bd470e75e94499609d6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 15 May 2023 05:05:05 +0000 Subject: [PATCH 284/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index b5fa24537f7..1eacf23dcbb 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit b5fa24537f70e88166c7e43d45b5f6ff41d0b12d +Subproject commit 1eacf23dcbbea2e5a7d17e8c325ce94ee0b1d3d1 From e978e254970c1eb3c4f7cdf82ce3cf1f6b81ebcd Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 22 May 2023 05:04:54 +0000 Subject: [PATCH 285/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 1eacf23dcbb..16c574cd266 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 1eacf23dcbbea2e5a7d17e8c325ce94ee0b1d3d1 +Subproject commit 16c574cd266ffe11ae48a37ccf3f6582ce90de21 From 561e6fafad9bf64eeca471ed97c1b035097fb8c3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 24 May 2023 05:04:46 +0000 Subject: [PATCH 286/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 16c574cd266..11dd2ac7457 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 16c574cd266ffe11ae48a37ccf3f6582ce90de21 +Subproject commit 11dd2ac7457bd22080b9d8e5277327110563919a From 7eaf3977f3c7a01f460d01be9e3eef07bd00f866 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 29 May 2023 05:04:50 +0000 Subject: [PATCH 287/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 11dd2ac7457..b0996e05775 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 11dd2ac7457bd22080b9d8e5277327110563919a +Subproject commit b0996e057750223a14321ff92c1c6d6fbb8e1a10 From 965bdd082dbb6870a53812f58708c73c6a12f132 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 1 Jun 2023 05:04:48 +0000 Subject: [PATCH 288/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index b0996e05775..b0d0cec71f2 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit b0996e057750223a14321ff92c1c6d6fbb8e1a10 +Subproject commit b0d0cec71f2240fc629dcaa1889ed8c4ad52beb9 From abf6c8f482f9cb8fc18b9ea25b7c9301ea56296d Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 5 Jun 2023 05:04:53 +0000 Subject: [PATCH 289/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index b0d0cec71f2..c70a6743f62 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit b0d0cec71f2240fc629dcaa1889ed8c4ad52beb9 +Subproject commit c70a6743f62af2c223f62c2fddd6a1a68271a50e From e15d75a155849699f9ef3c70fc8f26b930b6ff77 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 6 Jun 2023 05:05:03 +0000 Subject: [PATCH 290/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index c70a6743f62..3ac2b726f2c 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit c70a6743f62af2c223f62c2fddd6a1a68271a50e +Subproject commit 3ac2b726f2c019a1985dbd21abc3b7ca1d2374ba From 96bb05e9778eb1364b602847117fd144ca836eb7 Mon Sep 17 00:00:00 2001 From: ZauberNerd Date: Thu, 27 Apr 2023 13:46:27 +0200 Subject: [PATCH 291/338] chore: remove merged upstream PR patch This PR has been merged upstream and is no longer neccessary. --- patches | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches b/patches index ee9d2476d51..c4fc93da9d9 100644 --- a/patches +++ b/patches @@ -4,5 +4,3 @@ https://github.com/xing/act/pull/23 # customize goreleaser configuration https://github.com/xing/act/pull/22 # ------------------------------------------- -# Revert breaking docker socket changes -https://github.com/nektos/act/pull/1763 From 0af0de7225bfaf4d90ea0ec63fe989ed086d07cc Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 12 Jun 2023 12:14:06 +0000 Subject: [PATCH 292/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 3ac2b726f2c..b92d95f8993 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 3ac2b726f2c019a1985dbd21abc3b7ca1d2374ba +Subproject commit b92d95f89931549a235e5f141ecb0a053f4216d3 From 65218fb0671692f9a86442b95b8c4d2f720c6d6a Mon Sep 17 00:00:00 2001 From: Robert Kowalski Date: Mon, 12 Jun 2023 14:52:05 +0200 Subject: [PATCH 293/338] test: raise timeout to 25min current tests run 16min and test suite fails. see https://github.com/xing/act/actions/runs/5243399549/jobs/9468043925 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 24d9bf44e10..aae5b67abbb 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ act-build: patch .PHONY: act-test act-test: patch - cd act && go test -v -timeout 15m ./... + cd act && go test -v -timeout 25m ./... .PHONY: clean clean: From 450b9b53af435d45ad9502bef59ee710f1b07198 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 14 Jun 2023 07:16:56 +0000 Subject: [PATCH 294/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index b92d95f8993..24348ff1eec 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit b92d95f89931549a235e5f141ecb0a053f4216d3 +Subproject commit 24348ff1eec2ba2bec4a29fd4d544cb1788c9a1e From 40a3f10a8802c87e52119b927e0766b6e1c3d54c Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 15 Jun 2023 05:02:21 +0000 Subject: [PATCH 295/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 24348ff1eec..74c27db4dd6 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 24348ff1eec2ba2bec4a29fd4d544cb1788c9a1e +Subproject commit 74c27db4dd685b1465832c4de73786e397e2a3ce From 78b9e9ab6286cb586274c9ceedf4addf548267c2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 19 Jun 2023 05:02:14 +0000 Subject: [PATCH 296/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 74c27db4dd6..4fc176f556d 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 74c27db4dd685b1465832c4de73786e397e2a3ce +Subproject commit 4fc176f556dcf41e69854570ce65680f127a9357 From 3dd253677bcca2fb7f0ea791460b30932620f77d Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 26 Jun 2023 05:02:33 +0000 Subject: [PATCH 297/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 4fc176f556d..70e1e372804 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 4fc176f556dcf41e69854570ce65680f127a9357 +Subproject commit 70e1e372804054374c222c7de1e066bf7ab92b31 From b72301ddfc52ac9655c0c78ac0cd5e88bddd2d68 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 28 Jun 2023 05:02:38 +0000 Subject: [PATCH 298/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 70e1e372804..e60018a6d94 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 70e1e372804054374c222c7de1e066bf7ab92b31 +Subproject commit e60018a6d9403b27bfd1a1ed6111a6e9de0032fd From b35d2739039f58118a712800b355d9e271feef3a Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 1 Jul 2023 05:02:27 +0000 Subject: [PATCH 299/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index e60018a6d94..310cb79e81e 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit e60018a6d9403b27bfd1a1ed6111a6e9de0032fd +Subproject commit 310cb79e81e07ef11985b2f934092b82b167ccf1 From 4539ce2630996c621e1c54287dc348e09fb22c35 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 11 Jul 2023 05:02:15 +0000 Subject: [PATCH 300/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 310cb79e81e..94bc8b319c8 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 310cb79e81e07ef11985b2f934092b82b167ccf1 +Subproject commit 94bc8b319c8557ac992f8cf436d7953c4ebb62e5 From 9f192f7003ed0a5fd227d13ad3155f94134c23db Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 12 Jul 2023 05:02:26 +0000 Subject: [PATCH 301/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 94bc8b319c8..e343ea9d5f6 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 94bc8b319c8557ac992f8cf436d7953c4ebb62e5 +Subproject commit e343ea9d5f6fa478a364b1f502b4859eed63fa38 From 58b9e2b02b12f2a35d9435653d2111804311e989 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 18 Jul 2023 05:02:09 +0000 Subject: [PATCH 302/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index e343ea9d5f6..4810f69367a 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit e343ea9d5f6fa478a364b1f502b4859eed63fa38 +Subproject commit 4810f69367a141f9cc282d21ab61bb598d5ec584 From 666745770528c3e104dc855cb60c7682da9fc8b4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 20 Jul 2023 05:02:16 +0000 Subject: [PATCH 303/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 4810f69367a..83b0a5b1f2c 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 4810f69367a141f9cc282d21ab61bb598d5ec584 +Subproject commit 83b0a5b1f2cbc19338fa57659c51695744e89730 From 2ce1b3aa97f1754dc560a294af37426fc779f5c9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 22 Jul 2023 05:02:09 +0000 Subject: [PATCH 304/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 83b0a5b1f2c..67f4baa618b 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 83b0a5b1f2cbc19338fa57659c51695744e89730 +Subproject commit 67f4baa618b3371cc0ec0c03b169141c25809c9e From d7b7667d89a78af171a92dc0e2c2d897713e8c0d Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 24 Jul 2023 05:02:24 +0000 Subject: [PATCH 305/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 67f4baa618b..17bf4fc5afd 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 67f4baa618b3371cc0ec0c03b169141c25809c9e +Subproject commit 17bf4fc5afd147ea967445b9d0dc2e684f57377c From 5c37ab57662f065778e0e188594e7737ca608693 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 31 Jul 2023 05:02:26 +0000 Subject: [PATCH 306/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 17bf4fc5afd..8bf10cf8761 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 17bf4fc5afd147ea967445b9d0dc2e684f57377c +Subproject commit 8bf10cf87618e3ebe1c0f77c1add9e3a08b3f514 From af78750187a96b158107dcfc7d7c16d6c0bbe2b6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 1 Aug 2023 05:02:11 +0000 Subject: [PATCH 307/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 8bf10cf8761..d5d85485465 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 8bf10cf87618e3ebe1c0f77c1add9e3a08b3f514 +Subproject commit d5d854854651c151ecd914bb6e2e370e0057929a From dabe530de72d18b3f10431c180f2530200cc1b5b Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 7 Aug 2023 05:02:23 +0000 Subject: [PATCH 308/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index d5d85485465..74b74e847ba 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit d5d854854651c151ecd914bb6e2e370e0057929a +Subproject commit 74b74e847bad3c71ad7a1df76384a804bb46d644 From 3df83e53265a7059d1d8f7732321f59ffa500cc4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 9 Aug 2023 05:02:13 +0000 Subject: [PATCH 309/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 74b74e847ba..a42f3cf1cda 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 74b74e847bad3c71ad7a1df76384a804bb46d644 +Subproject commit a42f3cf1cdaa1d93da181bd5f556371d61198169 From 7b68f97dd7d182b19c2922af651b8d96b8bd5cb9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 10 Aug 2023 05:02:26 +0000 Subject: [PATCH 310/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index a42f3cf1cda..a00fd960a5d 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit a42f3cf1cdaa1d93da181bd5f556371d61198169 +Subproject commit a00fd960a5d67a21b87ce7f055d9ae89f1603345 From 4c2337160e06fee82ce0694e82ae3c848613c3dd Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 12 Aug 2023 05:02:21 +0000 Subject: [PATCH 311/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index a00fd960a5d..f55ae1a0bc4 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit a00fd960a5d67a21b87ce7f055d9ae89f1603345 +Subproject commit f55ae1a0bc4fb14d463b79a62ff9a37d7e5bda68 From 53118bed1334ed5f87ae3b8b5afe92c5405a3771 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 14 Aug 2023 05:02:32 +0000 Subject: [PATCH 312/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index f55ae1a0bc4..2a0a0a1a62b 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit f55ae1a0bc4fb14d463b79a62ff9a37d7e5bda68 +Subproject commit 2a0a0a1a62b8c72cd891208f085c00cb00402b57 From ee7ddb9c60ac337015f11d281dd02d813eb7defc Mon Sep 17 00:00:00 2001 From: ZauberNerd Date: Wed, 16 Aug 2023 16:42:21 +0200 Subject: [PATCH 313/338] chore: use go version from go.mod file --- .github/workflows/build-with-patches.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-with-patches.yml b/.github/workflows/build-with-patches.yml index 051ab6428a6..ee4bbd44436 100644 --- a/.github/workflows/build-with-patches.yml +++ b/.github/workflows/build-with-patches.yml @@ -2,9 +2,6 @@ name: Build act with patches on: [push, workflow_dispatch] -env: - GO_VERSION: 1.18 - jobs: calculate-tag: runs-on: ubuntu-latest @@ -37,7 +34,7 @@ jobs: git config --global user.email github-actions@github.com - uses: actions/setup-go@v3 with: - go-version: ${{ env.GO_VERSION }} + go-version-file: act/go.mod - name: compile run: | make act-build @@ -57,7 +54,7 @@ jobs: git config --global user.email github-actions@github.com - uses: actions/setup-go@v3 with: - go-version: ${{ env.GO_VERSION }} + go-version-file: act/go.mod - uses: docker/setup-qemu-action@v2 - uses: actions/cache@v3 with: @@ -95,7 +92,7 @@ jobs: git tag "${{ needs.calculate-tag.outputs.tag }}" - uses: actions/setup-go@v3 with: - go-version: ${{ env.GO_VERSION }} + go-version-file: act/go.mod - name: GoReleaser uses: goreleaser/goreleaser-action@v1 with: From 3867e603c796475486d54eec2e5b50bfa85c0c7c Mon Sep 17 00:00:00 2001 From: ZauberNerd Date: Wed, 16 Aug 2023 16:46:14 +0200 Subject: [PATCH 314/338] chore: replace deprecated set-output with GITHUB_OUTPUT --- compute-release-tag.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compute-release-tag.sh b/compute-release-tag.sh index 591c3f564c9..6e31fcc8938 100755 --- a/compute-release-tag.sh +++ b/compute-release-tag.sh @@ -5,7 +5,7 @@ set -euo pipefail version=$(cd act && git describe --tags --dirty --always |cut -d "-" -f 1) hash=$(./version-hash.sh) versionHash=${version}-${hash} -echo "::set-output name=versionHash::${versionHash}" +echo "versionHash=${versionHash}" >> $GITHUB_OUTPUT gitTag=$(git for-each-ref --sort=taggerdate --format '%(tag)' refs/tags |tail -1) # shellcheck disable=SC2001 @@ -16,12 +16,12 @@ else counter=$(("${counter}" + 1)) fi tag="${version}-xing.${counter}-${hash}" -echo "::set-output name=tag::${tag}" +echo "tag=${tag}" >> $GITHUB_OUTPUT latestHash="$(curl -fsSLI -o /dev/null -w "%{url_effective}" https://github.com/xing/act/releases/latest)" latestHash="${latestHash#https://github.com/xing/act/releases/tag/}" # shellcheck disable=SC2001 latestHash=$(echo "${latestHash}" |sed -e 's/-xing\.[[:digit:]]\+//') -echo "::set-output name=latestHash::${latestHash}" +echo "latestHash=${latestHash}" >> $GITHUB_OUTPUT echo "versionHash: ${versionHash} tag: ${tag} latestHash: ${latestHash}" From cc7b1bf30641fed8e8a97f37bd71989ec69f995d Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 18 Aug 2023 05:02:24 +0000 Subject: [PATCH 315/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 2a0a0a1a62b..7ba9f30f37a 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 2a0a0a1a62b8c72cd891208f085c00cb00402b57 +Subproject commit 7ba9f30f37af627f43adc2776c7f39ca3b5889bc From 71aa5d25112ae9b6b7a669659dcb882698019cb5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 21 Aug 2023 05:02:32 +0000 Subject: [PATCH 316/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 7ba9f30f37a..f64c267dacd 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 7ba9f30f37af627f43adc2776c7f39ca3b5889bc +Subproject commit f64c267dacd026b306da8ee405e84df56d124e69 From 11d73d9ff629590cc94a5fb6b12017fe5c291a6d Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 22 Aug 2023 05:02:25 +0000 Subject: [PATCH 317/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index f64c267dacd..7286b43b0ea 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit f64c267dacd026b306da8ee405e84df56d124e69 +Subproject commit 7286b43b0ea0110cc2052848c8c1c4ab66bcd068 From bd76d6a22a5271fbe9fba25ec1f69cbd06a964cf Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 28 Aug 2023 05:02:31 +0000 Subject: [PATCH 318/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 7286b43b0ea..0c12273ebaa 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 7286b43b0ea0110cc2052848c8c1c4ab66bcd068 +Subproject commit 0c12273ebaa937c52dea06d91b8985304874ab14 From a10cf1b36631d88d13308de6f6de8d3bb7afe160 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 1 Sep 2023 05:02:25 +0000 Subject: [PATCH 319/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 0c12273ebaa..80b09553038 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 0c12273ebaa937c52dea06d91b8985304874ab14 +Subproject commit 80b0955303888742c3ab73af5758bb7b01f5f57c From c54b014157439f12d00dbff58c4b6241b276f97c Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 4 Sep 2023 05:02:40 +0000 Subject: [PATCH 320/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 80b09553038..1d32507b52c 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 80b0955303888742c3ab73af5758bb7b01f5f57c +Subproject commit 1d32507b52c8a3c502415d1350aeca0eb9dcfe81 From d7674053bc00bb2bf428ef94d48287bac1e16815 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 11 Sep 2023 05:02:24 +0000 Subject: [PATCH 321/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 1d32507b52c..c84a3ef6d0e 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 1d32507b52c8a3c502415d1350aeca0eb9dcfe81 +Subproject commit c84a3ef6d0e4c545f627572aef0c0313bc9d4187 From faddf6f2658ea985dca197add316ac2d36e825f4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 13 Sep 2023 05:02:28 +0000 Subject: [PATCH 322/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index c84a3ef6d0e..19764bcb06a 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit c84a3ef6d0e4c545f627572aef0c0313bc9d4187 +Subproject commit 19764bcb06ac9acdd7100d95c72055b697820705 From 0c889472de447b40f1f616b2ddf68b3a59bb786b Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 15 Sep 2023 05:02:26 +0000 Subject: [PATCH 323/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 19764bcb06a..935e37c25b6 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 19764bcb06ac9acdd7100d95c72055b697820705 +Subproject commit 935e37c25b6c48b50882024b3c4235d12f23f469 From 96b8ce1b3c79a88ce69d5478b29f5c0a6e2d4234 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 18 Sep 2023 05:02:32 +0000 Subject: [PATCH 324/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 935e37c25b6..b637d79ec3a 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 935e37c25b6c48b50882024b3c4235d12f23f469 +Subproject commit b637d79ec3a0468e0ff968cdf57420c7020265c8 From af507c1f65cd2776fd1184756b06e4d1d78ad3a3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 24 Sep 2023 05:02:29 +0000 Subject: [PATCH 325/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index b637d79ec3a..c241ecda318 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit b637d79ec3a0468e0ff968cdf57420c7020265c8 +Subproject commit c241ecda318e4977501971c267f0a2fad70ea5cd From 145c3ed6c5ad75029c3a9ec28ade9b3cd88decfa Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 25 Sep 2023 05:02:33 +0000 Subject: [PATCH 326/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index c241ecda318..2be4def7be0 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit c241ecda318e4977501971c267f0a2fad70ea5cd +Subproject commit 2be4def7be0deda86b7e0a00aa06be5e87ac599c From 47c6d2b6b93e9a111bc43f36baf70aab909ff767 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 1 Oct 2023 05:02:26 +0000 Subject: [PATCH 327/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 2be4def7be0..44ea01c2097 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 2be4def7be0deda86b7e0a00aa06be5e87ac599c +Subproject commit 44ea01c2097eaad1596f4dafd6ec84872bd00402 From 849820aa470959dbbb59ebfc10570ba6ab0de873 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 4 Oct 2023 05:02:33 +0000 Subject: [PATCH 328/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 44ea01c2097..976df8bae51 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 44ea01c2097eaad1596f4dafd6ec84872bd00402 +Subproject commit 976df8bae51318f13b289c3dcceb719f2e983c42 From 36bad81436e20a74b4531131510438c4646192f4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 9 Oct 2023 05:02:27 +0000 Subject: [PATCH 329/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 976df8bae51..e7e158cd7ee 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 976df8bae51318f13b289c3dcceb719f2e983c42 +Subproject commit e7e158cd7eed7c78d7111111aa1d005cadf1df0c From 5b5e4eef14fe7979e41483203e409b7f07302604 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 12 Oct 2023 05:02:37 +0000 Subject: [PATCH 330/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index e7e158cd7ee..99067a9c1ed 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit e7e158cd7eed7c78d7111111aa1d005cadf1df0c +Subproject commit 99067a9c1ed3b9cdb75797a7e87e6ef0471105f8 From bdcd88814ab52abdfe1f3a1dd0cc636fa9f98643 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 14 Oct 2023 05:02:30 +0000 Subject: [PATCH 331/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 99067a9c1ed..ace4cd47c7f 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 99067a9c1ed3b9cdb75797a7e87e6ef0471105f8 +Subproject commit ace4cd47c7f099864866b1f60e064fecde7f36ea From 15719e283bf6892111f1b2bf9e3f7296839e91a3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 20 Oct 2023 05:02:23 +0000 Subject: [PATCH 332/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index ace4cd47c7f..ceeb6c160c3 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit ace4cd47c7f099864866b1f60e064fecde7f36ea +Subproject commit ceeb6c160c3ea72cd2f3758360a2468fcefe1cce From 411c39dd295b7be63b651a0539026b95bfafa1dd Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 23 Oct 2023 05:02:25 +0000 Subject: [PATCH 333/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index ceeb6c160c3..db71c41d17e 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit ceeb6c160c3ea72cd2f3758360a2468fcefe1cce +Subproject commit db71c41d17e967bc12ec24c122aad9d314c7d693 From 8da7c14b774e2d6220f03769175279b2d2f208dd Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 30 Oct 2023 05:02:26 +0000 Subject: [PATCH 334/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index db71c41d17e..84a4025bc84 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit db71c41d17e967bc12ec24c122aad9d314c7d693 +Subproject commit 84a4025bc844eee060ad0d2d71af7b4bd2595a94 From f995999dfacb0bdff062a1e478b77873a1844a51 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 1 Nov 2023 05:02:29 +0000 Subject: [PATCH 335/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 84a4025bc84..1bb2ee7098f 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 84a4025bc844eee060ad0d2d71af7b4bd2595a94 +Subproject commit 1bb2ee7098f338765ce5169c850d0f19e59d3147 From 62bd18296d3b13bc3d9f90a95a059ac3ca1e8c39 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 5 Nov 2023 05:02:22 +0000 Subject: [PATCH 336/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 1bb2ee7098f..5a79256ee4d 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 1bb2ee7098f338765ce5169c850d0f19e59d3147 +Subproject commit 5a79256ee4d65ca068687bd0c85cd112d438a5d8 From b734d1deb7a98047aac926cb379cef32b06e189b Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 6 Nov 2023 05:02:33 +0000 Subject: [PATCH 337/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 5a79256ee4d..55b09a04cd1 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 5a79256ee4d65ca068687bd0c85cd112d438a5d8 +Subproject commit 55b09a04cd14006b34eef02f0d19120759ee167b From 7ab5ee739fe4c24b49b02c9eda039c06616f4e7e Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 13 Nov 2023 05:02:22 +0000 Subject: [PATCH 338/338] chore: update act (submodule) --- act | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/act b/act index 55b09a04cd1..4dcb9b7a139 160000 --- a/act +++ b/act @@ -1 +1 @@ -Subproject commit 55b09a04cd14006b34eef02f0d19120759ee167b +Subproject commit 4dcb9b7a139f7399b2778575e61a398aefb41d85