diff --git a/.github/workflows/desktop.release.reuse.yml b/.github/workflows/desktop.release.reuse.yml index 548acf90d..6a4560504 100644 --- a/.github/workflows/desktop.release.reuse.yml +++ b/.github/workflows/desktop.release.reuse.yml @@ -25,16 +25,16 @@ jobs: registry-url: 'https://registry.npmjs.org' - run: yarn install - run: yarn build:desktop - - run: export APP_VERSION=$(node -p "require('./package.json').version") + - run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV - name: Compile Mac run: yarn run webpack --config desktop.webpack.prod.js - name: MacX64 run: | - yarn run electron-builder --mac --x64 --publish=never --c.extraMetadata.version=$APP_VERSION + yarn run electron-builder --mac --x64 --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }} node scripts/fixMacZip.js - name: MacArm64 - run: yarn run electron-builder --mac --arm64 --publish=never --c.extraMetadata.version=$APP_VERSION + run: yarn run electron-builder --mac --arm64 --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }} - name: Upload uses: actions/upload-artifact@v3.0.0 @@ -65,37 +65,37 @@ jobs: - run: yarn install - run: yarn build:desktop - - run: export APP_VERSION=$(node -p "require('./package.json').version") + - run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV - name: Compile for AppImage run: yarn run webpack --config desktop.webpack.prod.js - name: AppImage - run: yarn run electron-builder --linux --x64 --ia32 -c.linux.target=AppImage --publish=never --c.extraMetadata.version=$APP_VERSION + run: yarn run electron-builder --linux --x64 --ia32 -c.linux.target=AppImage --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }} - name: AppImageX64 - run: yarn run electron-builder --linux --x64 -c.linux.target=AppImage --publish=never --c.extraMetadata.version=$APP_VERSION + run: yarn run electron-builder --linux --x64 -c.linux.target=AppImage --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }} - name: AppImageArm64 - run: yarn run electron-builder --linux --arm64 -c.linux.target=AppImage --publish=never --c.extraMetadata.version=$APP_VERSION + run: yarn run electron-builder --linux --arm64 -c.linux.target=AppImage --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }} - name: Deb run: | yarn run webpack --config desktop.webpack.prod.js --env deb - yarn run electron-builder --linux --x64 --ia32 -c.linux.target=deb --publish=never --c.extraMetadata.version=$APP_VERSION + yarn run electron-builder --linux --x64 --ia32 -c.linux.target=deb --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }} - name: DebArm64 env: npm_config_target_arch: 'arm64' USE_SYSTEM_FPM: 'true' run: | yarn run webpack --config desktop.webpack.prod.js --env deb - yarn run electron-builder --linux --arm64 -c.linux.target=deb --publish=never --c.extraMetadata.version=$APP_VERSION + yarn run electron-builder --linux --arm64 -c.linux.target=deb --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }} - name: Dir run: | yarn run webpack --config desktop.webpack.prod.js - yarn run electron-builder --linux --x64 -c.linux.target=dir --publish=never --c.extraMetadata.version=$APP_VERSION + yarn run electron-builder --linux --x64 -c.linux.target=dir --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }} - name: DirArm64 run: | yarn run webpack --config desktop.webpack.prod.js - yarn run electron-builder --linux --arm64 -c.linux.target=dir --publish=never --c.extraMetadata.version=$APP_VERSION + yarn run electron-builder --linux --arm64 -c.linux.target=dir --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }} env: npm_config_target_arch: 'arm64' @@ -103,7 +103,7 @@ jobs: run: | sudo snap install snapcraft --classic yarn run webpack --config desktop.webpack.prod.js --env snap - yarn run electron-builder --linux --x64 -c.linux.target=snap --publish=never --c.extraMetadata.version=$APP_VERSION + yarn run electron-builder --linux --x64 -c.linux.target=snap --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }} - name: Upload uses: actions/upload-artifact@v3.0.0 @@ -133,8 +133,8 @@ jobs: - run: yarn install - run: yarn build:desktop - run: yarn run webpack --config desktop.webpack.prod.js - - run: export APP_VERSION=$(node -p "require('./package.json').version") - - run: yarn run electron-builder --windows --x64 --ia32 --publish=never --c.extraMetadata.version=$APP_VERSION + - run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV + - run: yarn run electron-builder --windows --x64 --ia32 --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }} - name: Upload uses: actions/upload-artifact@v3.0.0 diff --git a/.github/workflows/desktop.windows.sign.yml b/.github/workflows/desktop.windows.sign.yml index a3ca7e6d4..73b1c72f3 100644 --- a/.github/workflows/desktop.windows.sign.yml +++ b/.github/workflows/desktop.windows.sign.yml @@ -21,8 +21,8 @@ jobs: - run: yarn install - run: yarn build:desktop - run: yarn run webpack --config desktop.webpack.prod.js - - run: export APP_VERSION=$(node -p "require('./package.json').version") - - run: yarn run electron-builder --windows --x64 --ia32 --publish=never --c.extraMetadata.version=$APP_VERSION + - run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV + - run: yarn run electron-builder --windows --x64 --ia32 --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }} - name: Upload uses: actions/upload-artifact@v3.0.0 diff --git a/packages/desktop/app/package.json b/packages/desktop/app/package.json index aca92310b..6635450cd 100644 --- a/packages/desktop/app/package.json +++ b/packages/desktop/app/package.json @@ -1,6 +1,5 @@ { "name": "@standardnotes/inner-desktop", - "version": "0.0.1", "productName": "Standard Notes", "private": true, "description": "An end-to-end encrypted notes app for digitalists and professionals.",