From b80c4282243fa53c7bf2a4a9e6a134625603ee74 Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Thu, 5 Sep 2024 11:52:53 +0200 Subject: [PATCH] changed manifest build --- .github/workflows/build-app-beta.yaml | 6 ++++++ .github/workflows/build-app-pro.yaml | 21 +++++++-------------- .github/workflows/build-app.yaml | 16 ++++------------ 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build-app-beta.yaml b/.github/workflows/build-app-beta.yaml index 7be276ed..f0479852 100644 --- a/.github/workflows/build-app-beta.yaml +++ b/.github/workflows/build-app-beta.yaml @@ -30,6 +30,9 @@ jobs: - name: yarn adjustPackageJson run: | yarn adjustPackageJson + - name: setUpdaterChannel beta + run: | + node setUpdaterChannel beta - name: yarn set timeout run: | yarn config set network-timeout 100000 @@ -100,6 +103,9 @@ jobs: mv app/dist/*.snap artifacts/ || true mv app/dist/*.dmg artifacts/ || true + mv app/dist/*.yml artifacts/ || true + rm artifacts/builder-debug.yml + - name: Upload artifacts uses: actions/upload-artifact@v1 with: diff --git a/.github/workflows/build-app-pro.yaml b/.github/workflows/build-app-pro.yaml index e33a555f..c15c16cf 100644 --- a/.github/workflows/build-app-pro.yaml +++ b/.github/workflows/build-app-pro.yaml @@ -61,6 +61,11 @@ jobs: cd .. cd dbgate-merged node adjustPackageJsonPremium + - name: setUpdaterChannel premium + run: | + cd .. + cd dbgate-merged + node setUpdaterChannel premium - name: yarn set timeout run: | cd .. @@ -131,20 +136,8 @@ jobs: mv ../dbgate-merged/app/dist/*.deb artifacts/ || true mv ../dbgate-merged/app/dist/*.dmg artifacts/ || true - - name: Copy latest.yml (windows) - if: matrix.os == 'windows-2022' - run: | - mv ../dbgate-merged/app/dist/latest.yml artifacts/latest-premium.yml || true - - - name: Copy latest-linux.yml - if: matrix.os == 'ubuntu-22.04' - run: | - mv ../dbgate-merged/app/dist/latest-linux.yml artifacts/latest-premium-linux.yml || true - - - name: Copy latest-mac.yml - if: matrix.os == 'macos-12' - run: | - mv ../dbgate-merged/app/dist/latest-mac.yml artifacts/latest-premium-mac.yml || true + mv app/dist/*.yml artifacts/ || true + rm artifacts/builder-debug.yml - name: Upload artifacts uses: actions/upload-artifact@v1 diff --git a/.github/workflows/build-app.yaml b/.github/workflows/build-app.yaml index 1cb7ec9b..87f6734c 100644 --- a/.github/workflows/build-app.yaml +++ b/.github/workflows/build-app.yaml @@ -110,6 +110,9 @@ jobs: mv app/dist/*.dmg artifacts/ || true mv app/dist/*.snap artifacts/dbgate-latest.snap || true + mv app/dist/*.yml artifacts/ || true + rm artifacts/builder-debug.yml + # - name: Copy artifacts Linux, MacOs # if: matrix.os != 'windows-2016' # run: | @@ -134,22 +137,11 @@ jobs: # mv app/dist/latest.yml artifacts/latest.yml || true - - name: Copy latest.yml (windows) + - name: Copy PAD file if: matrix.os == 'windows-2022' run: | - mv app/dist/latest.yml artifacts/latest.yml || true mv app/dist/dbgate-pad.xml artifacts/ || true - - name: Copy latest-linux.yml - if: matrix.os == 'ubuntu-22.04' - run: | - mv app/dist/latest-linux.yml artifacts/latest-linux.yml || true - - - name: Copy latest-mac.yml - if: matrix.os == 'macos-12' - run: | - mv app/dist/latest-mac.yml artifacts/latest-mac.yml || true - - name: Upload artifacts uses: actions/upload-artifact@v1 with: