From c798881c25d0de4c4d7edc86dde4166cfbe8ca92 Mon Sep 17 00:00:00 2001 From: NAmorim Date: Fri, 5 Nov 2021 15:14:06 +0000 Subject: [PATCH 1/3] [Distribution] Workflow clenaup. Add linux build. --- .github/workflows/release_build_dev.yml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release_build_dev.yml b/.github/workflows/release_build_dev.yml index a0784fb09..0efb7ca69 100644 --- a/.github/workflows/release_build_dev.yml +++ b/.github/workflows/release_build_dev.yml @@ -17,11 +17,9 @@ jobs: id: date run: echo "::set-output name=date::$(date +'%Y%m%d')" - - name: get-version - id: version - uses: nyaa8/package-version@v1 - with: - path: './package.json' + - name: Get version + id: vars + run: echo "::set-output name=tag::$(node -p "require('./package.json').version")" - name: Create nightly release id: create_release @@ -29,8 +27,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{ env.PACKAGE_VERSION }}.${{ steps.date.outputs.date }} - release_name: Superalgos ${{ env.PACKAGE_VERSION }} Snapshot ${{ steps.date.outputs.date }} + tag_name: ${{ steps.vars.outputs.tag }}.${{ steps.date.outputs.date }} + release_name: Superalgos-Beta-v${{ steps.vars.outputs.tag }} Snapshot ${{ steps.date.outputs.date }} keep_num: 5 keep_tags: false @@ -39,7 +37,7 @@ jobs: needs: create-release strategy: matrix: - os: [windows-latest, macos-latest] + os: [windows-latest, macos-latest, ubuntu-latest] steps: - name: Get current date @@ -56,11 +54,9 @@ jobs: with: node-version: 14 - - name: get-version - id: version - uses: nyaa8/package-version@v1 - with: - path: './package.json' + - name: Get version + id: vars + run: echo "::set-output name=tag::$(node -p "require('./package.json').version")" - name: Build/release Electron app uses: samuelmeuli/action-electron-builder@v1 @@ -68,7 +64,7 @@ jobs: # GitHub token, automatically provided to the action # (No need to define this secret in the repo settings) github_token: ${{ secrets.github_token }} - args: "-c.extraMetadata.main=electron-wrapper.js -c.extraMetadata.version=${{ env.PACKAGE_VERSION }}.${{ steps.date.outputs.date }} -c build/electron-builder.json -p onTagOrDraft" + args: "-c.extraMetadata.version=${{ steps.vars.outputs.tag }}.${{ steps.date.outputs.date }} -c build/electron-builder.json -p onTagOrDraft" # If the commit is tagged with a version (e.g. "v1.0.0"), # release the app after building From 6bd6178e4fb4a4795eb23c720d90c3c1e5ed1acb Mon Sep 17 00:00:00 2001 From: NAmorim Date: Fri, 5 Nov 2021 15:15:11 +0000 Subject: [PATCH 2/3] Enable Linux builds (pc and rpi) Enable zipped package --- build/electron-builder.json | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/build/electron-builder.json b/build/electron-builder.json index 7554534f0..9624635e9 100644 --- a/build/electron-builder.json +++ b/build/electron-builder.json @@ -1,7 +1,7 @@ { "appId": "org.superalgos.platform", "productName": "Superalgos", - "asar": false, + "asar": true, "generateUpdatesFilesForAllChannels": true, "files": [ "**/*", @@ -54,12 +54,16 @@ "target": [ { "target": "dmg", - "arch": "x64" - }, + "arch": ["x64", "arm64"] + } + ] + }, + "linux": { + "target": [ { - "target": "dmg", - "arch": "arm64" - } + "target": "AppImage", + "arch": ["x64", "armv7l"] + } ] }, "extraMetadata": { From fff090d5bf1022f15c2736cc4597dd216f5b12ff Mon Sep 17 00:00:00 2001 From: NAmorim Date: Fri, 5 Nov 2021 15:16:05 +0000 Subject: [PATCH 3/3] Simpler release workflow action --- .github/workflows/release_build.yml | 48 ++++++----------------------- 1 file changed, 9 insertions(+), 39 deletions(-) diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index fbb2ef9e0..646f96612 100644 --- a/.github/workflows/release_build.yml +++ b/.github/workflows/release_build.yml @@ -1,38 +1,16 @@ name: Build/release Binaries + on: - pull_request: - branches: [master] - #release: - # types: [published, created] + release: + types: + - published workflow_dispatch: jobs: - create-release: - runs-on: ubuntu-latest - steps: - - name: Download a file - run: curl "https://raw.githubusercontent.com/${{ github.repository }}/master/package.json" -o package.json - - - name: get-version - id: version - uses: nyaa8/package-version@v1 - with: - path: './package.json' - - - name: Create release - id: create_release - uses: viperproject/create-nightly-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ env.PACKAGE_VERSION }} - release_name: Superalgos-v${{ env.PACKAGE_VERSION }} - build-release: runs-on: ${{ matrix.os }} - needs: create-release strategy: matrix: os: [windows-latest, macos-latest] @@ -40,19 +18,15 @@ jobs: steps: - name: Check out Git repository uses: actions/checkout@v2 - with: - ref: develop - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v1 with: node-version: 14 - - - name: get-version - id: version - uses: nyaa8/package-version@v1 - with: - path: './package.json' + + - name: Get version + id: vars + run: echo "::set-output name=tag::$(node -p "require('./package.json').version")" - name: Build/release Electron app uses: samuelmeuli/action-electron-builder@v1 @@ -60,10 +34,6 @@ jobs: # GitHub token, automatically provided to the action # (No need to define this secret in the repo settings) github_token: ${{ secrets.github_token }} - args: "-c.extraMetadata.version=${{ env.PACKAGE_VERSION }} -c build/electron-builder.json -p always" - - # If the commit is tagged with a version (e.g. "v1.0.0"), - # release the app after building - # release: ${{ startsWith(github.ref, 'refs/tags/v') }} + args: "-c.extraMetadata.version=${{ steps.vars.outputs.tag }} -c build/electron-builder.json -p always" release: true