diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5506d4f..4f9359d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,7 @@ jobs: shell: bash env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: npm run build:${{ matrix.platform }} + run: npm run build:${{ matrix.platform }} -- --publish=never - name: Upload artifact uses: actions/upload-artifact@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 672fada..8b3edf1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -136,7 +136,7 @@ jobs: - name: Package app if: matrix.os == 'windows-2022' shell: bash - run: npm run build:win + run: npm run build:win -- --publish=always env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -156,13 +156,13 @@ jobs: APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }} run: | - npm run build:mac -- --${{ matrix.arch }} + npm run build:mac -- --${{ matrix.arch }} --publish=always rm ./.a.p8 - name: Package app if: matrix.os == 'ubuntu-latest' shell: bash - run: npm run build:linux -- --${{ matrix.arch }} + run: npm run build:linux -- --${{ matrix.arch }} --publish=always env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -175,20 +175,12 @@ jobs: mv $dmg_file $new_dmg_file - id: relinfo + if: matrix.os != 'windows-2022' uses: pozetroninc/github-action-get-latest-release@master with: repository: pierr3/TrackAudio token: ${{ secrets.GITHUB_TOKEN }} - - name: Upload artifacts - uses: softprops/action-gh-release@v2 - if: matrix.os == 'windows-2022' - with: - tag_name: ${{ steps.relinfo.outputs.release }} - files: | - dist/*.exe - dist/*.zip - - name: Upload artifacts uses: softprops/action-gh-release@v2 if: matrix.os == 'macos-latest' diff --git a/electron-builder-config.js b/electron-builder-config.js index b2ecd1c..cc746a9 100644 --- a/electron-builder-config.js +++ b/electron-builder-config.js @@ -5,9 +5,11 @@ module.exports = { buildResources: 'build' }, publish: { - provider: 's3', - bucket: 'trackaudio', - region: 'eu-west-2' + provider: 'github', + owner: 'pierr3', + repo: 'TrackAudio', + releaseType: 'draft', + vPrefixedTagName: false }, files: [ '!**/.vscode/*', @@ -22,7 +24,6 @@ module.exports = { asarUnpack: ['resources/**', './src/renderer/src/assets/md80_error.mp3'], win: { executableName: 'trackaudio', - extraFiles: [ { from: 'backend/build/Release/', diff --git a/package.json b/package.json index 7e57d4b..f89041f 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,6 @@ "build:win": "npm run build && electron-builder --win -c electron-builder-config.js", "build:mac": "npm run build && electron-builder --mac -c electron-builder-config.js", "build:linux": "npm run build && electron-builder --linux -c electron-builder-config.js", - "build:win:publish": "npm run build && electron-builder --win -c electron-builder-config.js --publish=always", "build:backend": "cd backend && npm install && npm run build:release && cd .. && npm install ./backend/trackaudio-afv-1.0.0.tgz", "build:backend-fast": "cd backend && npm install && npm run build:release-fast && cd .. && npm install ./backend/trackaudio-afv-1.0.0.tgz", "build:backend-debug": "cd backend && npm install && npm run build:debug && cd .. && npm install ./backend/trackaudio-afv-1.0.0.tgz"