diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6dbe4eb7..0c8f81ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,6 +22,44 @@ jobs: - name: Install dependencies run: yarn + - name: Install Python + uses: actions/setup-python@v5 + with: + python-version: 3.9 + + - name: Install dependencies + run: pip install -r requirements.txt + + - name: Build with cx_Freeze + run: python torrent-client/setup.py build + + - name: Build Linux + if: matrix.os == 'ubuntu-latest' + run: | + sudo apt-get update + sudo apt-get install -y libarchive-tools + yarn build:linux + env: + MAIN_VITE_API_URL: ${{ vars.MAIN_VITE_STAGING_API_URL }} + MAIN_VITE_AUTH_URL: ${{ vars.MAIN_VITE_STAGING_AUTH_URL }} + MAIN_VITE_CHECKOUT_URL: ${{ vars.MAIN_VITE_STAGING_CHECKOUT_URL }} + MAIN_VITE_ANALYTICS_API_URL: ${{ vars.MAIN_VITE_ANALYTICS_API_URL }} + RENDERER_VITE_INTERCOM_APP_ID: ${{ vars.RENDERER_VITE_INTERCOM_APP_ID }} + RENDERER_VITE_EXTERNAL_RESOURCES_URL: ${{ vars.RENDERER_VITE_EXTERNAL_RESOURCES_URL }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Build Windows + if: matrix.os == 'windows-latest' + run: yarn build:win + env: + MAIN_VITE_API_URL: ${{ vars.MAIN_VITE_STAGING_API_URL }} + MAIN_VITE_AUTH_URL: ${{ vars.MAIN_VITE_STAGING_AUTH_URL }} + MAIN_VITE_CHECKOUT_URL: ${{ vars.MAIN_VITE_STAGING_CHECKOUT_URL }} + MAIN_VITE_ANALYTICS_API_URL: ${{ vars.MAIN_VITE_ANALYTICS_API_URL }} + RENDERER_VITE_INTERCOM_APP_ID: ${{ vars.RENDERER_VITE_INTERCOM_APP_ID }} + RENDERER_VITE_EXTERNAL_RESOURCES_URL: ${{ vars.RENDERER_VITE_EXTERNAL_RESOURCES_URL }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Test Upload build env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} @@ -33,55 +71,17 @@ jobs: GITHUB_ACTOR: ${{ github.actor }} run: node scripts/upload-build.cjs - # - name: Install Python - # uses: actions/setup-python@v5 - # with: - # python-version: 3.9 - - # - name: Install dependencies - # run: pip install -r requirements.txt - - # - name: Build with cx_Freeze - # run: python torrent-client/setup.py build - - # - name: Build Linux - # if: matrix.os == 'ubuntu-latest' - # run: | - # sudo apt-get update - # sudo apt-get install -y libarchive-tools - # yarn build:linux - # env: - # MAIN_VITE_API_URL: ${{ vars.MAIN_VITE_STAGING_API_URL }} - # MAIN_VITE_AUTH_URL: ${{ vars.MAIN_VITE_STAGING_AUTH_URL }} - # MAIN_VITE_CHECKOUT_URL: ${{ vars.MAIN_VITE_STAGING_CHECKOUT_URL }} - # MAIN_VITE_ANALYTICS_API_URL: ${{ vars.MAIN_VITE_ANALYTICS_API_URL }} - # RENDERER_VITE_INTERCOM_APP_ID: ${{ vars.RENDERER_VITE_INTERCOM_APP_ID }} - # RENDERER_VITE_EXTERNAL_RESOURCES_URL: ${{ vars.RENDERER_VITE_EXTERNAL_RESOURCES_URL }} - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - # - name: Build Windows - # if: matrix.os == 'windows-latest' - # run: yarn build:win - # env: - # MAIN_VITE_API_URL: ${{ vars.MAIN_VITE_STAGING_API_URL }} - # MAIN_VITE_AUTH_URL: ${{ vars.MAIN_VITE_STAGING_AUTH_URL }} - # MAIN_VITE_CHECKOUT_URL: ${{ vars.MAIN_VITE_STAGING_CHECKOUT_URL }} - # MAIN_VITE_ANALYTICS_API_URL: ${{ vars.MAIN_VITE_ANALYTICS_API_URL }} - # RENDERER_VITE_INTERCOM_APP_ID: ${{ vars.RENDERER_VITE_INTERCOM_APP_ID }} - # RENDERER_VITE_EXTERNAL_RESOURCES_URL: ${{ vars.RENDERER_VITE_EXTERNAL_RESOURCES_URL }} - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - # - name: Create artifact - # uses: actions/upload-artifact@v4 - # with: - # name: Build-${{ matrix.os }} - # path: | - # dist/*-portable.exe - # dist/*.zip - # dist/*.dmg - # dist/*.deb - # dist/*.rpm - # dist/*.tar.gz - # dist/*.yml - # dist/*.blockmap - # dist/*.pacman + - name: Create artifact + uses: actions/upload-artifact@v4 + with: + name: Build-${{ matrix.os }} + path: | + dist/*-portable.exe + dist/*.zip + dist/*.dmg + dist/*.deb + dist/*.rpm + dist/*.tar.gz + dist/*.yml + dist/*.blockmap + dist/*.pacman diff --git a/scripts/upload-build.cjs b/scripts/upload-build.cjs index 93f1c149..49fcbbd2 100644 --- a/scripts/upload-build.cjs +++ b/scripts/upload-build.cjs @@ -18,9 +18,9 @@ const s3 = new S3Client({ }, }); -const dist = path.resolve(__dirname, "..", "resources"); +const dist = path.resolve(__dirname, "..", "dist"); -const extensionsToUpload = [".deb", ".exe", ".png"]; +const extensionsToUpload = [".deb", ".exe"]; fs.readdir(dist, async (err, files) => { if (err) throw err;