From 6987d75bb3f04c2f32ebfc362f9576509866ce4f Mon Sep 17 00:00:00 2001 From: omove <61330514+omove@users.noreply.github.com> Date: Wed, 20 Nov 2024 14:51:01 -0500 Subject: [PATCH] remove changes made for test runs --- .github/workflows/build.yml | 6 -- .github/workflows/linux-release-build.yml | 2 - .github/workflows/macos-release-build.yml | 12 ++-- .github/workflows/windows-release-build.yml | 2 - package.json | 6 +- pnpm-lock.yaml | 77 ++++++++++----------- 6 files changed, 46 insertions(+), 59 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f9a72c1f8..33112f72c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -117,8 +117,6 @@ jobs: - name: Install dependencies run: | pnpm install - pnpm uninstall @zen-browser/surfer - pnpm install github:omove/surfer - name: Setup Surfer run: | @@ -181,8 +179,6 @@ jobs: - name: Install dependencies run: | pnpm install - pnpm uninstall @zen-browser/surfer - pnpm install github:omove/surfer - name: Setup surfer run: | @@ -239,8 +235,6 @@ jobs: - name: Install dependencies run: | pnpm install - pnpm uninstall @zen-browser/surfer - pnpm install github:omove/surfer - name: Load surfer CI setup run: pnpm surfer ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }} diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml index 45f9338c8..f311a87e6 100644 --- a/.github/workflows/linux-release-build.yml +++ b/.github/workflows/linux-release-build.yml @@ -90,8 +90,6 @@ jobs: - name: Install dependencies run: | pnpm install - pnpm uninstall @zen-browser/surfer - pnpm install github:omove/surfer - name: Load surfer CI setup run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }} diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml index 52595ea9a..edcbb7809 100644 --- a/.github/workflows/macos-release-build.yml +++ b/.github/workflows/macos-release-build.yml @@ -96,8 +96,6 @@ jobs: - name: Install dependencies run: | pnpm install - pnpm uninstall @zen-browser/surfer - pnpm install github:omove/surfer - name: Load surfer CI setup run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }} @@ -138,11 +136,11 @@ jobs: export SURFER_PLATFORM="darwin" sh .github/workflows/src/release-build.sh -#: - name: import APPLE DEVELOPER ID CERTIFICATE for .app -#: uses: apple-actions/import-codesign-certs@v3 -#: with: -#: p12-file-base64: ${{ secrets.macOS_CERTIFICATES_P12_For_App_BASE64 }} -#: p12-password: ${{ secrets.macOS_CERTIFICATES_P12_PASSWORD }} + - name: import APPLE DEVELOPER ID CERTIFICATE for .app + uses: apple-actions/import-codesign-certs@v3 + with: + p12-file-base64: ${{ secrets.macOS_CERTIFICATES_P12_For_App_BASE64 }} + p12-password: ${{ secrets.macOS_CERTIFICATES_P12_PASSWORD }} - name: Package env: diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml index 42967b2dd..681b98a6f 100644 --- a/.github/workflows/windows-release-build.yml +++ b/.github/workflows/windows-release-build.yml @@ -56,8 +56,6 @@ jobs: - name: Install dependencies run: | pnpm install - pnpm uninstall @zen-browser/surfer - pnpm install github:omove/surfer - name: Load surfer CI setup run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }} diff --git a/package.json b/package.json index ba8555bd3..a40d8ff0b 100644 --- a/package.json +++ b/package.json @@ -32,12 +32,12 @@ "url": "https://github.com/zen-browser/core/issues" }, "homepage": "https://github.com/zen-browser/core#readme", + "dependencies": { + "@zen-browser/surfer": "^1.5.2" + }, "devDependencies": { "husky": "^9.1.5", "lint-staged": "^15.2.10", "prettier": "^3.3.3" - }, - "dependencies": { - "@zen-browser/surfer": "github:omove/surfer" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a1b34496f..1344b6a41 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: '@zen-browser/surfer': - specifier: github:omove/surfer - version: https://codeload.github.com/omove/surfer/tar.gz/0754810059fd13eb68443ffab434eb7c2ca36b52 + specifier: ^1.5.2 + version: 1.5.2 devDependencies: husky: specifier: ^9.1.5 @@ -119,9 +119,8 @@ packages: '@types/node@17.0.45': resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} - '@zen-browser/surfer@https://codeload.github.com/omove/surfer/tar.gz/0754810059fd13eb68443ffab434eb7c2ca36b52': - resolution: {tarball: https://codeload.github.com/omove/surfer/tar.gz/0754810059fd13eb68443ffab434eb7c2ca36b52} - version: 1.5.2 + '@zen-browser/surfer@1.5.2': + resolution: {integrity: sha512-QJT12gcFWdicEVlh0o9tVi7FQmoGuYuy+ROgzFzLMclbQSyJxhVaYy08A1S0y+Fn2rzs7BflmZ1zXPrabiLgpA==} hasBin: true ansi-escapes@7.0.0: @@ -261,11 +260,11 @@ packages: resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==} engines: {node: '>= 0.6'} - core-js-pure@3.39.0: - resolution: {integrity: sha512-7fEcWwKI4rJinnK+wLTezeg2smbFFdSBP6E2kQZNbnzM2s1rpKQ6aaRteZSSg7FLU3P0HGGVo/gbpfanU36urg==} + core-js-pure@3.37.1: + resolution: {integrity: sha512-J/r5JTHSmzTxbiYYrzXg9w1VpqrYt+gexenBE9pugeyhwPZTAEJddyiReJWsLO6uNQ8xJZFbod6XC7KKwatCiA==} - core-js@3.39.0: - resolution: {integrity: sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==} + core-js@3.37.1: + resolution: {integrity: sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==} core-util-is@1.0.3: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} @@ -349,8 +348,8 @@ packages: flush-write-stream@2.0.0: resolution: {integrity: sha512-uXClqPxT4xW0lcdSBheb2ObVU+kuqUk3Jk64EwieirEXZx9XUrVwp/JuBfKAWaM4T5Td/VL7QLDWPXp/MvGm/g==} - follow-redirects@1.15.9: - resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==} + follow-redirects@1.15.6: + resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==} engines: {node: '>=4.0'} peerDependencies: debug: '*' @@ -584,8 +583,8 @@ packages: resolution: {integrity: sha512-Sv05IW2MuG7C+gVTHirqF8cbqAM8MeMEIKU3MIQDA1pyXKnv0AGa/3l0iwXk/i+81OoFzt+iU0p8DdphV2Ejww==} engines: {node: '>=0.8'} - modern-async@1.1.5: - resolution: {integrity: sha512-Yioj6tw1jvZef+bYjcZN9gMPBpVkkqGOMbQg/1U9dIqdij44mpftvNJxTf/u2Gc6oobuNGUFWNJwJwq8qEs9bw==} + modern-async@1.1.4: + resolution: {integrity: sha512-jaZlzQB3W9PRF43+T144lYWb7UaTapJM6MZxNGLqpgPVal6uV4ixkR+t/1H1/7UM03jDu5BnvAYDqeawvL7kiw==} mount-dmg@1.0.1: resolution: {integrity: sha512-YEHSgtE1d6jIm6ht0uqo4MWQSXHvHYujgURXf+59hQDErH5bL5rv4uGwko8ejiFIeK6ySk8jBX1oX9NrlmBTCg==} @@ -602,8 +601,8 @@ packages: next-tick@1.1.0: resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==} - node-abi@3.71.0: - resolution: {integrity: sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw==} + node-abi@3.65.0: + resolution: {integrity: sha512-ThjYBfoDNr08AWx6hGaRbfPwxKV9kVzAzOzlLKbk2CuqXE2xnCh+cbAGnwM3t8Lq4v9rUB7VfondlkBckcJrVA==} engines: {node: '>=10'} node-addon-api@5.1.0: @@ -690,8 +689,8 @@ packages: resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==} engines: {node: '>= 6'} - pump@3.0.2: - resolution: {integrity: sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==} + pump@3.0.0: + resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==} pumpify@2.0.1: resolution: {integrity: sha512-m7KOje7jZxrmutanlkS1daj1dS6z6BgslzOXmcSEpIlCxM3VJH7lG5QLeck/6hgF6F4crFf01UtQmNsJfweTAw==} @@ -743,8 +742,8 @@ packages: resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==} hasBin: true - semver@7.6.3: - resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==} + semver@7.6.2: + resolution: {integrity: sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==} engines: {node: '>=10'} hasBin: true @@ -1004,7 +1003,7 @@ snapshots: '@types/node@17.0.45': {} - '@zen-browser/surfer@https://codeload.github.com/omove/surfer/tar.gz/0754810059fd13eb68443ffab434eb7c2ca36b52': + '@zen-browser/surfer@1.5.2': dependencies: '@resvg/resvg-js': 1.4.0 async-icns: 1.0.2 @@ -1018,13 +1017,13 @@ snapshots: ini: 3.0.1 is-apple-silicon: https://codeload.github.com/trickypr/is-apple-silicon/tar.gz/5f75501a1d7566ba9f94174b6825d7bd9d302b6a kleur: 4.1.5 - modern-async: 1.1.5 + modern-async: 1.1.4 mount-dmg: 1.0.1 picomatch: 2.3.1 png-to-ico: 2.1.8 prompts: 2.4.2 rustic: 1.2.2 - semver: 7.6.3 + semver: 7.6.2 sharp: 0.30.7 tiny-glob: 0.2.9 xmlbuilder2: 3.1.1 @@ -1060,7 +1059,7 @@ snapshots: axios@0.21.4: dependencies: - follow-redirects: 1.15.9 + follow-redirects: 1.15.6 transitivePeerDependencies: - debug @@ -1167,9 +1166,9 @@ snapshots: dependencies: safe-buffer: 5.2.1 - core-js-pure@3.39.0: {} + core-js-pure@3.37.1: {} - core-js@3.39.0: {} + core-js@3.37.1: {} core-util-is@1.0.3: {} @@ -1240,7 +1239,7 @@ snapshots: extract-base-iterator@1.0.1: dependencies: - core-js: 3.39.0 + core-js: 3.37.1 fs-access-compat: 1.0.3 graceful-fs: 4.2.11 is-absolute: 1.0.0 @@ -1255,7 +1254,7 @@ snapshots: bl: 3.0.1 buffer-v6-polyfill: 1.0.5 content-disposition: 0.5.4 - core-js: 3.39.0 + core-js: 3.37.1 end-of-stream: 1.4.4 flush-write-stream: 2.0.0 lodash.throttle: 4.1.1 @@ -1286,7 +1285,7 @@ snapshots: inherits: 2.0.4 readable-stream: 3.6.2 - follow-redirects@1.15.9: {} + follow-redirects@1.15.6: {} fs-access-compat@1.0.3: {} @@ -1476,9 +1475,9 @@ snapshots: get-caller-file: 2.0.5 normalize-path: 3.0.0 - modern-async@1.1.5: + modern-async@1.1.4: dependencies: - core-js-pure: 3.39.0 + core-js-pure: 3.37.1 nanoassert: 2.0.0 mount-dmg@1.0.1: @@ -1493,9 +1492,9 @@ snapshots: next-tick@1.1.0: {} - node-abi@3.71.0: + node-abi@3.65.0: dependencies: - semver: 7.6.3 + semver: 7.6.2 node-addon-api@5.1.0: {} @@ -1553,8 +1552,8 @@ snapshots: minimist: 1.2.8 mkdirp-classic: 0.5.3 napi-build-utils: 1.0.2 - node-abi: 3.71.0 - pump: 3.0.2 + node-abi: 3.65.0 + pump: 3.0.0 rc: 1.2.8 simple-get: 4.0.1 tar-fs: 2.1.1 @@ -1574,7 +1573,7 @@ snapshots: kleur: 3.0.3 sisteransi: 1.0.5 - pump@3.0.2: + pump@3.0.0: dependencies: end-of-stream: 1.4.4 once: 1.4.0 @@ -1583,7 +1582,7 @@ snapshots: dependencies: duplexify: 4.1.3 inherits: 2.0.4 - pump: 3.0.2 + pump: 3.0.0 queue-cb@1.2.1: {} @@ -1636,7 +1635,7 @@ snapshots: semver@5.7.2: {} - semver@7.6.3: {} + semver@7.6.2: {} sharp@0.30.7: dependencies: @@ -1644,7 +1643,7 @@ snapshots: detect-libc: 2.0.3 node-addon-api: 5.1.0 prebuild-install: 7.1.2 - semver: 7.6.3 + semver: 7.6.2 simple-get: 4.0.1 tar-fs: 2.1.1 tunnel-agent: 0.6.0 @@ -1745,7 +1744,7 @@ snapshots: dependencies: chownr: 1.1.4 mkdirp-classic: 0.5.3 - pump: 3.0.2 + pump: 3.0.0 tar-stream: 2.2.0 tar-iterator@1.0.1: