diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69af78a..ef41d94 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,8 +3,6 @@ on: push: branches: - '*' - tags-ignore: - - '*' workflow_dispatch: env: CARGO_TERM_COLOR: always @@ -46,7 +44,7 @@ jobs: matrix: include: - { name: arm64, arch: aarch64, tauri_target: aarch64 } - - { name: x64, arch: x86_64, tauri_target: x86_64 } + # - { name: x64, arch: x86_64, tauri_target: x86_64 } steps: - name: Checkout repository uses: actions/checkout@v4 @@ -98,4 +96,4 @@ jobs: projectPath: mobile uploadWorkflowArtifacts: true mobile: android - args: --apk --split-per-abi --target ${{ matrix.tauri_target }} + args: --apk --split-per-abi --target ${{ matrix.tauri_target }} --config '{"version":"0.0.1"}' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ad620d3..5c12d2e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -101,15 +101,20 @@ jobs: base64 -d <<< "${{ secrets.ANDROID_KEY_BASE64 }}" > $RUNNER_TEMP/keystore.jks echo "storeFile=$RUNNER_TEMP/keystore.jks" >> keystore.properties + - name: Get version + run: echo "APP_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_ENV + - name: Build # uploadWorkflowArtifacts and mobile are not released - uses: tauri-apps/tauri-action@a1b01e690374452a209dd44f6de089dda9003d3d + # uses: tauri-apps/tauri-action@a1b01e690374452a209dd44f6de089dda9003d3d + uses: probablykasper/tauri-action@ed2469ebf97aca60a033d455c4f2c28c65375fa3 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: projectPath: mobile mobile: android - tagName: ${{ github.ref_name }} - releaseName: ${{ github.ref_name }} + tagName: v${{ env.APP_VERSION }} + releaseName: ${{ env.APP_VERSION }} releaseDraft: true - args: --apk --split-per-abi --target ${{ matrix.tauri_target }} + releaseAssetNamePattern: '[name]-v[version]-[platform]-[arch][ext]' + args: --apk --split-per-abi --target ${{ matrix.tauri_target }} --config '{"version":"${{ env.APP_VERSION }}"}' diff --git a/mobile/package.json b/mobile/package.json index 17ebadc..40591e0 100644 --- a/mobile/package.json +++ b/mobile/package.json @@ -1,7 +1,5 @@ { "name": "ferrum", - "version": "0.1.0", - "description": "", "type": "module", "scripts": { "dev": "tauri dev", diff --git a/mobile/src-tauri/tauri.conf.json b/mobile/src-tauri/tauri.conf.json index 6ce46ab..d73ff41 100644 --- a/mobile/src-tauri/tauri.conf.json +++ b/mobile/src-tauri/tauri.conf.json @@ -1,7 +1,6 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Ferrum", - "version": "0.1.0", "identifier": "space.kasper.ferrum", "build": { "beforeDevCommand": "npm run dev:web",