From edd1e01dc2b7ce0dbc6983fc16e64ecc7c7ff9b0 Mon Sep 17 00:00:00 2001 From: Kampfkarren Date: Sat, 15 Oct 2022 14:35:55 -0700 Subject: [PATCH 1/3] Fix checking for version after workspace version migrations [release] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 375dcf21..683962e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -109,7 +109,7 @@ jobs: zip -rj selene-macos.zip ./artifacts/selene-macos/* zip -rj selene-windows.zip ./artifacts/selene-windows/* - VERSION=`grep -Po '(?<=^version = ")([^"]+)' ./selene/Cargo.toml` + VERSION=`grep -Po '(?<=^version = ")([^"]+)' ./Cargo.toml` echo "VERSION=$VERSION" >> $GITHUB_ENV - name: Get changelog run: | From a878615f4390f273eed32c6393d941336ee119b6 Mon Sep 17 00:00:00 2001 From: Kampfkarren Date: Sat, 15 Oct 2022 14:44:08 -0700 Subject: [PATCH 2/3] Force release --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 683962e3..466162a0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -94,7 +94,7 @@ jobs: release: runs-on: ubuntu-latest needs: ['build_windows_light', 'build_windows', 'build_mac', 'build_mac_light', 'build_linux', 'build_linux_light'] - if: contains(github.event.head_commit.message, '[release]') + # if: contains(github.event.head_commit.message, '[release]') steps: - uses: actions/checkout@v1 - name: Download artifacts From 67417683d09cf5ecfdfc73f0a4ea8a008a62df7e Mon Sep 17 00:00:00 2001 From: Kampfkarren Date: Sat, 15 Oct 2022 14:54:17 -0700 Subject: [PATCH 3/3] Fix syntax in CHANGELOG extracting --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 466162a0..be5861da 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -113,7 +113,7 @@ jobs: echo "VERSION=$VERSION" >> $GITHUB_ENV - name: Get changelog run: | - CHANGELOG_ENTRY=`grep --color=never -m 1 -Po '## \K(\[[0-9\.]+\].+)' CHANGELOG.md | sed -E 's/\(.+?\)//g` + CHANGELOG_ENTRY=`grep --color=never -m 1 -Po '## \K(\[[0-9\.]+\].+)' CHANGELOG.md | sed -E 's/\(.+?\)//g'` DESCRIPTION=`bash ./misc/extract-changelog.sh $CHANGELOG_ENTRY` echo "CHANGELOG_ENTRY=$CHANGELOG_ENTRY" >> $GITHUB_ENV