From c62dbfebfa23dee3260fa05ecb253a6f6941badb Mon Sep 17 00:00:00 2001 From: Andrei Benea Date: Fri, 9 Feb 2024 17:29:21 +0100 Subject: [PATCH] Bump version to 1.0. Also: - include version in release artifacts zip names - remove v prefix from tags. --- .github/workflows/build.yml | 17 +++++++---------- project.clj | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b4fa1f3..14329ba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,8 +3,7 @@ name: Build on: push: branches: [ "master" ] - tags: - - v* + tags: [ "*" ] env: CARGO_TERM_COLOR: always @@ -30,7 +29,7 @@ jobs: target/release/csdemoparser.exe package: - if: startsWith(github.ref, 'refs/tags/v') + if: startsWith(github.ref, 'refs/tags/') runs-on: ubuntu-latest needs: build steps: @@ -71,24 +70,22 @@ jobs: - uses: actions/download-artifact@v4 - name: Package Windows run: | - mkdir -p windows/headshotbox + mkdir -p release windows/headshotbox cp windows-latest/csdemoparser.exe windows/headshotbox/ cp target-lein/hsbox-*-standalone.jar windows/headshotbox/hsbox-standalone.jar echo 'start javaw -jar hsbox-standalone.jar --port 4000 --systray' > windows/headshotbox/headshotbox.bat echo 'java -jar hsbox-standalone.jar --port 4000' > windows/headshotbox/headshotbox_console.bat - cd windows && zip ../headshotbox-win.zip headshotbox/* + cd windows && zip ../release/headshotbox-${GITHUB_REF_NAME}-win.zip headshotbox/* - name: Package Linux run: | - mkdir -p linux/headshotbox + mkdir -p release linux/headshotbox cp ubuntu-20.04/csdemoparser linux/headshotbox/ cp target-lein/hsbox-*-standalone.jar linux/headshotbox/hsbox-standalone.jar echo 'java -jar hsbox-standalone.jar --port 4000' > linux/headshotbox/headshotbox.sh chmod a+x linux/headshotbox/headshotbox.sh linux/headshotbox/csdemoparser - cd linux && zip ../headshotbox-linux.zip headshotbox/* + cd linux && zip ../release/headshotbox-${GITHUB_REF_NAME}-linux.zip headshotbox/* - name: Release uses: softprops/action-gh-release@v1 with: draft: true - files: | - headshotbox-linux.zip - headshotbox-win.zip + files: release/* diff --git a/project.clj b/project.clj index 1cd43e2..56a503a 100644 --- a/project.clj +++ b/project.clj @@ -1,5 +1,5 @@ (defproject - hsbox "0.18.2" + hsbox "1.0" :description "Headshot Box" :url "http://headshotbox.github.io" :license {:name "Eclipse Public License"