diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index d7a6c79f2..584fca5ad 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -195,7 +195,7 @@ jobs: uses: ./.github/workflows/windows-profile-build.yml permissions: contents: write - needs: [build-data] + needs: [windows-step-1, build-data] with: build-version: ${{ needs.build-data.outputs.version }} profile-data-path-archive: zen-windows-x86_64-profile-data-and-jarlog.zip diff --git a/.github/workflows/windows-profile-build.yml b/.github/workflows/windows-profile-build.yml index 2f33d61b2..6de70c72f 100644 --- a/.github/workflows/windows-profile-build.yml +++ b/.github/workflows/windows-profile-build.yml @@ -31,9 +31,27 @@ jobs: run: | npm i -g @zen-browser/surfer + - uses: actions/download-artifact@v4 + name: Download artifact + with: + path: C:\artifact + + - name: Unpack artifact + run: | + cd C:\artifact + ls + 7z x ${{ inputs.profile-data-path-archive }} + ls + + - name: Setup + run: | + (New-Object System.Net.WebClient).DownloadFile("https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe","C:\MozillaBuildSetup-Latest.exe") + C:\MozillaBuildSetup-Latest.exe /S | out-null - name: Download firefox - run: pnpm surfer download + run: | + git config --global core.safecrlf false + pnpm surfer download - name: Generate run: | diff --git a/package.json b/package.json index 9e2fed08e..06584b41f 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,6 @@ }, "homepage": "https://github.com/zen-browser/core#readme", "dependencies": { - "@zen-browser/surfer": "^1.0.37" + "@zen-browser/surfer": "^1.1.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a68352b87..21ee6f861 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: '@zen-browser/surfer': - specifier: ^1.0.37 - version: 1.0.37 + specifier: ^1.1.1 + version: 1.1.1 packages: @@ -109,8 +109,8 @@ packages: '@types/node@17.0.45': resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} - '@zen-browser/surfer@1.0.37': - resolution: {integrity: sha512-HKWgjfRpNuykDN5tKGrBQkEqOvGUsVdDIYw2uI7pocrWw58hKQ5JFvhRrtwi5NuiypR6lZ1rxXlGYQHX44N6OQ==} + '@zen-browser/surfer@1.1.1': + resolution: {integrity: sha512-lNJDQovwa/wySkZcARa+FrL59VVZP+qMaksfiGxaxbsFy5JsH0WPaAU1TiqLH9yIuTMWJenpQp+JplM6YeiMjA==} hasBin: true ansi-regex@5.0.1: @@ -786,7 +786,7 @@ snapshots: '@types/node@17.0.45': {} - '@zen-browser/surfer@1.0.37': + '@zen-browser/surfer@1.1.1': dependencies: '@resvg/resvg-js': 1.4.0 async-icns: 1.0.2