From 84d2bdac3a4249b9d6634b59dec03764e60f804d Mon Sep 17 00:00:00 2001 From: Emiliano Bonilla <56323762+emilbon99@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:21:18 -0700 Subject: [PATCH] [ops] - updated console deploy --- .github/workflows/deploy.console.yaml | 34 ++++++++++----------------- .github/workflows/deploy.synnax.yaml | 8 +++---- .github/workflows/test.aspen.yaml | 6 ++--- .github/workflows/test.cesium.yaml | 6 ++--- .github/workflows/test.client.yaml | 6 ++--- .github/workflows/test.drift.yaml | 6 ++--- .github/workflows/test.freighter.yaml | 6 ++--- .github/workflows/test.pluto.yaml | 6 ++--- .github/workflows/test.synnax.yaml | 6 ++--- .github/workflows/test.x.yaml | 6 ++--- 10 files changed, 41 insertions(+), 49 deletions(-) diff --git a/.github/workflows/deploy.console.yaml b/.github/workflows/deploy.console.yaml index 5a9e52af27..20bf3ea713 100644 --- a/.github/workflows/deploy.console.yaml +++ b/.github/workflows/deploy.console.yaml @@ -17,6 +17,7 @@ jobs: setup: runs-on: ubuntu-latest outputs: + PURE_VERSION: ${{ steps.version.outputs.PURE_VERSION }} VERSION: ${{ steps.version.outputs.VERSION }} changed: ${{ steps.filter.outputs.changed }} steps: @@ -29,8 +30,10 @@ jobs: run: | if [ "${GITHUB_REF}" == "refs/heads/main" ]; then echo "VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT + echo "PURE_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT else echo "VERSION=$(node -p "require('./package.json').version")-rc" >> $GITHUB_OUTPUT + echo "PURE_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT fi - name: Diff Changes @@ -137,17 +140,6 @@ jobs: restore-keys: | ${{ runner.os }}-turbo- - - name: Install Dependencies on Ubuntu - if: matrix.platform == 'ubuntu-latest' - run: >- - sudo apt-get update && - sudo apt-get install -y - libgtk-3-dev - libayatana-appindicator3-dev - libwebkit2gtk-4.0-dev - webkit2gtk-driver - xvfb - - name: Install Dependencies run: pnpm i @@ -175,18 +167,18 @@ jobs: run: | gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/macos/Synnax.app.tar.gz gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/macos/Synnax.app.tar.gz.sig - gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/dmg/Synnax_${{ needs.setup.outputs.VERSION }}_x64.dmg + gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/dmg/Synnax_${{ needs.setup.outputs.PURE_VERSION }}_x64.dmg - name: Upload Windows Release Asset if: github.event_name == 'push' && matrix.platform == 'windows-latest' run: | - gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/msi/Synnax_${{ needs.setup.outputs.VERSION }}_x64_en-US.msi - gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/msi/Synnax_${{ needs.setup.outputs.VERSION }}_x64_en-US.msi.zip - gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/msi/Synnax_${{ needs.setup.outputs.VERSION }}_x64_en-US.msi.zip.sig - gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/nsis/Synnax_${{ needs.setup.outputs.VERSION }}_x64-setup.exe - gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/nsis/Synnax_${{ needs.setup.outputs.VERSION }}_x64-setup.nsis.zip - gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/nsis/Synnax_${{ needs.setup.outputs.VERSION }}_x64-setup.nsis.zip.sig + gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/msi/Synnax_${{ needs.setup.outputs.PURE_VERSION }}_x64_en-US.msi + gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/msi/Synnax_${{ needs.setup.outputs.PURE_VERSION }}_x64_en-US.msi.zip + gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/msi/Synnax_${{ needs.setup.outputs.PURE_VERSION }}_x64_en-US.msi.zip.sig + gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/nsis/Synnax_${{ needs.setup.outputs.PURE_VERSION }}_x64-setup.exe + gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/nsis/Synnax_${{ needs.setup.outputs.PURE_VERSION }}_x64-setup.nsis.zip + gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/nsis/Synnax_${{ needs.setup.outputs.PURE_VERSION }}_x64-setup.nsis.zip.sig publish-release: runs-on: ubuntu-latest @@ -228,7 +220,7 @@ jobs: script: | const fs = await import("fs"); - const version = process.env.VERSION; + const version = process.env.PURE_VERSION; const { repo: { repo, owner }, } = context; @@ -237,13 +229,13 @@ jobs: const darwinURL = baseURL + "Synnax.app.tar.gz"; const darwinSig = await github.request(`GET ${darwinURL}.sig`); - const windowsURL = baseURL + `Synnax_${packageVersion}_x64_en-US.msi.zip`; + const windowsURL = baseURL + `Synnax_${version}_x64_en-US.msi.zip`; const windowsSig = await github.request(`GET ${windowsURL}.sig`); const pub_date = new Date().toISOString().replace(/\.\d{3}Z$/, "Z"); const ecd = new TextDecoder(); const data = { - version: `v${packageVersion}`, + version: `v${version}`, notes: "Synnax Update", pub_date, platforms: { diff --git a/.github/workflows/deploy.synnax.yaml b/.github/workflows/deploy.synnax.yaml index 2417930e3f..aaec8baab1 100644 --- a/.github/workflows/deploy.synnax.yaml +++ b/.github/workflows/deploy.synnax.yaml @@ -1,9 +1,9 @@ name: Synnax Deploy on: - push: - branches: - - rc - - main +# push: +# branches: +# - rc +# - main pull_request: branches: - rc diff --git a/.github/workflows/test.aspen.yaml b/.github/workflows/test.aspen.yaml index 180e66e6fa..d246dba491 100644 --- a/.github/workflows/test.aspen.yaml +++ b/.github/workflows/test.aspen.yaml @@ -3,9 +3,9 @@ on: pull_request: branches: - rc - push: - branches: - - rc +# push: +# branches: +# - rc workflow_dispatch: jobs: test: diff --git a/.github/workflows/test.cesium.yaml b/.github/workflows/test.cesium.yaml index c1c19107c9..931e0d1d07 100644 --- a/.github/workflows/test.cesium.yaml +++ b/.github/workflows/test.cesium.yaml @@ -3,9 +3,9 @@ on: pull_request: branches: - rc - push: - branches: - - rc +# push: +# branches: +# - rc workflow_dispatch: jobs: test: diff --git a/.github/workflows/test.client.yaml b/.github/workflows/test.client.yaml index 5e0bbdad35..85730d3bca 100644 --- a/.github/workflows/test.client.yaml +++ b/.github/workflows/test.client.yaml @@ -3,9 +3,9 @@ on: pull_request: branches: - rc - push: - branches: - - rc +# push: +# branches: +# - rc workflow_dispatch: jobs: test-python: diff --git a/.github/workflows/test.drift.yaml b/.github/workflows/test.drift.yaml index 190d8dec87..0a4a3c5644 100644 --- a/.github/workflows/test.drift.yaml +++ b/.github/workflows/test.drift.yaml @@ -3,9 +3,9 @@ on: pull_request: branches: - rc - push: - branches: - - rc +# push: +# branches: +# - rc workflow_dispatch: jobs: test: diff --git a/.github/workflows/test.freighter.yaml b/.github/workflows/test.freighter.yaml index ae22b27b3b..84590dc752 100644 --- a/.github/workflows/test.freighter.yaml +++ b/.github/workflows/test.freighter.yaml @@ -3,9 +3,9 @@ on: pull_request: branches: - rc - push: - branches: - - rc +# push: +# branches: +# - rc workflow_dispatch: permissions: contents: write diff --git a/.github/workflows/test.pluto.yaml b/.github/workflows/test.pluto.yaml index f88d74ff1d..9f4f0703e1 100644 --- a/.github/workflows/test.pluto.yaml +++ b/.github/workflows/test.pluto.yaml @@ -3,9 +3,9 @@ on: pull_request: branches: - rc - push: - branches: - - rc +# push: +# branches: +# - rc workflow_dispatch: jobs: test: diff --git a/.github/workflows/test.synnax.yaml b/.github/workflows/test.synnax.yaml index 09817beb9c..a2bf87577f 100644 --- a/.github/workflows/test.synnax.yaml +++ b/.github/workflows/test.synnax.yaml @@ -3,9 +3,9 @@ on: pull_request: branches: - rc - push: - branches: - - rc +# push: +# branches: +# - rc workflow_dispatch: jobs: test: diff --git a/.github/workflows/test.x.yaml b/.github/workflows/test.x.yaml index 4461aa24bf..79d19fe6b9 100644 --- a/.github/workflows/test.x.yaml +++ b/.github/workflows/test.x.yaml @@ -3,9 +3,9 @@ on: pull_request: branches: - rc - push: - branches: - - rc +# push: +# branches: +# - rc workflow_dispatch: jobs: test-go: