diff options
| author | Stefan Boberg <[email protected]> | 2022-06-16 15:42:17 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2022-06-16 15:42:17 +0200 |
| commit | b8797a647406d31ebfd137a9ae07819ccf332a10 (patch) | |
| tree | b57dcb1443c817577e1c9f8e10a35837e1d85389 /.github/workflows | |
| parent | asio: added some context to error reporting (diff) | |
| download | zen-b8797a647406d31ebfd137a9ae07819ccf332a10.tar.xz zen-b8797a647406d31ebfd137a9ae07819ccf332a10.zip | |
merged from main
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/create_release.yml | 20 | ||||
| -rw-r--r-- | .github/workflows/validate.yml | 6 |
2 files changed, 16 insertions, 10 deletions
diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 76cc863a4..0d6baa193 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -2,18 +2,14 @@ name: Create Release on: push: - # Sequence of patterns matched against refs/tags - tags: - - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 + paths: + - 'VERSION.txt' jobs: bundle-windows: - runs-on: [self-hosted, windows, x64] - env: VCPKG_VERSION: 2022.03.10 - ZEN_VERSION: ${{github.ref.name}} steps: - uses: actions/checkout@v2 @@ -43,7 +39,6 @@ jobs: xmake bundle -v -y env: VCPKG_ROOT: ${{ github.workspace }}/.vcpkg - ZEN_VERSION: ${{ github.ref_name }} - name: Upload zenserver-win64 uses: actions/upload-artifact@v3 @@ -53,7 +48,6 @@ jobs: bundle-linux: runs-on: [self-hosted, linux, x64] - env: VCPKG_VERSION: 2022.03.10 @@ -90,7 +84,6 @@ jobs: xmake bundle -v -y env: VCPKG_ROOT: ${{ github.workspace }}/.vcpkg - ZEN_VERSION: ${{ github.ref_name }} - name: Upload zenserver-linux uses: actions/upload-artifact@v3 @@ -101,6 +94,7 @@ jobs: create-release: runs-on: [self-hosted, linux, x64] needs: [bundle-linux, bundle-windows] + steps: - uses: actions/checkout@v2 @@ -134,13 +128,19 @@ jobs: with: path: "CHANGELOG.tmp" + - name: Read VERSION.txt + id: read_version + uses: andstor/file-reader-action@v1 + with: + path: "VERSION.txt" + - name: Create Release id: create_release uses: softprops/action-gh-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{github.ref.name}} + tag_name: v${{steps.read_version.outputs.contents}} body: | ${{steps.read_changelog.outputs.contents}} draft: false diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 3988a9dfb..7ceec353b 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -4,8 +4,14 @@ on: pull_request: types: [opened, reopened, synchronize] branches: [ main ] + paths-ignore: + - 'VERSION.txt' + - 'CHANGELOG.md' push: branches: [ main ] + paths-ignore: + - 'VERSION.txt' + - 'CHANGELOG.md' jobs: cancel-old-build: |