From 3bb25d8e014c4ee64c79e447d536e8f206982a84 Mon Sep 17 00:00:00 2001 From: taukakao Date: Thu, 20 Feb 2025 00:03:23 +0100 Subject: [PATCH] adjusts github workflows --- .github/workflows/build.yml | 4 ---- .github/workflows/release.yml | 9 ++++----- VERSION | 1 - meson.build | 2 +- 4 files changed, 5 insertions(+), 11 deletions(-) delete mode 100644 VERSION diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3478aa58..f9d9b9c5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,10 +18,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Get the version - id: get_version - run: echo "{VERSION}={$(cat VERSION)}" >> $GITHUB_OUTPUT - - name: Install build dependencies run: | apt-get update diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5bf640df..0a3e0e89 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,8 +5,6 @@ on: tags: - '*' -# TODO: publish .deb to github release - jobs: build-artifacts: runs-on: ubuntu-latest @@ -22,9 +20,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Get the version - id: get_version - run: echo "{VERSION}={$(cat VERSION)}" >> $GITHUB_OUTPUT + - name: Set meson version by tag + id: set_version + run: | + sed -i 's/VTESTING/${{ github.ref_name }}/g' meson.build - name: Install build dependencies run: | diff --git a/VERSION b/VERSION deleted file mode 100644 index 4a36342f..00000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -3.0.0 diff --git a/meson.build b/meson.build index 3da2aa3d..a3e11314 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('org.vanillaos.FirstSetup', - version: '3.0.0', + version: 'VTESTING', meson_version: '>= 0.59.0', default_options: [ 'warning_level=2', 'werror=false',