From b13705ba3dee531d711b9cf78b40b39d67536bfe Mon Sep 17 00:00:00 2001 From: LongYinan Date: Tue, 24 Oct 2023 18:09:40 +0800 Subject: [PATCH] ci: remove setup-maker to reduce release duration (#4710) --- .github/actions/setup-maker/action.yml | 15 -- .github/workflows/nightly-build.yml | 3 - .github/workflows/release-desktop-app.yml | 8 - packages/frontend/electron/package.json | 1 + packages/frontend/graphql/package.json | 2 +- yarn.lock | 281 +++++++++++++++++++++- 6 files changed, 281 insertions(+), 29 deletions(-) delete mode 100644 .github/actions/setup-maker/action.yml diff --git a/.github/actions/setup-maker/action.yml b/.github/actions/setup-maker/action.yml deleted file mode 100644 index 53587106ed..0000000000 --- a/.github/actions/setup-maker/action.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Setup maker -description: 'Setup maker dmg for electron' - -runs: - using: 'composite' - steps: - - name: 'Install @electron-forge/maker-dmg' - if: runner.os == 'macos' - shell: bash - run: yarn workspace @affine/electron add @electron-forge/maker-dmg --dev - env: - HUSKY: '0' - PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: '1' - ELECTRON_SKIP_BINARY_DOWNLOAD: '1' - SENTRYCLI_SKIP_DOWNLOAD: '1' diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index b577b52edf..c08dc1c3ce 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -124,9 +124,6 @@ jobs: hard-link-nm: false build-plugins: false nmHoistingLimits: workspaces - - name: Setup Maker - timeout-minutes: 10 - uses: ./.github/actions/setup-maker - name: Build AFFiNE native uses: ./.github/actions/build-rust with: diff --git a/.github/workflows/release-desktop-app.yml b/.github/workflows/release-desktop-app.yml index 0933da911c..c231b260cd 100644 --- a/.github/workflows/release-desktop-app.yml +++ b/.github/workflows/release-desktop-app.yml @@ -111,9 +111,6 @@ jobs: hard-link-nm: false build-plugins: false nmHoistingLimits: workspaces - - name: Setup Maker - timeout-minutes: 10 - uses: ./.github/actions/setup-maker - name: Build AFFiNE native uses: ./.github/actions/build-rust with: @@ -188,9 +185,6 @@ jobs: hard-link-nm: false build-plugins: false nmHoistingLimits: workspaces - - name: Setup Maker - timeout-minutes: 10 - uses: ./.github/actions/setup-maker - name: Build AFFiNE native uses: ./.github/actions/build-rust with: @@ -371,8 +365,6 @@ jobs: RELEASE_VERSION: ${{ github.event.inputs.version || needs.before-make.outputs.RELEASE_VERSION }} - name: Create Release Draft uses: softprops/action-gh-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} with: name: ${{ github.event.inputs.version || needs.before-make.outputs.RELEASE_VERSION }} body: '' diff --git a/packages/frontend/electron/package.json b/packages/frontend/electron/package.json index afd7ccde8a..4872060d01 100644 --- a/packages/frontend/electron/package.json +++ b/packages/frontend/electron/package.json @@ -40,6 +40,7 @@ "@electron-forge/core": "^6.4.2", "@electron-forge/core-utils": "^6.4.2", "@electron-forge/maker-deb": "^6.4.2", + "@electron-forge/maker-dmg": "^6.4.2", "@electron-forge/maker-squirrel": "^6.4.2", "@electron-forge/maker-zip": "^6.4.2", "@electron-forge/shared-types": "^6.4.2", diff --git a/packages/frontend/graphql/package.json b/packages/frontend/graphql/package.json index ae99bea2de..bec7369367 100644 --- a/packages/frontend/graphql/package.json +++ b/packages/frontend/graphql/package.json @@ -20,7 +20,7 @@ "vitest": "0.34.6" }, "scripts": { - "postinstall": "gql-gen" + "postinstall": "gql-gen --errors-only" }, "dependencies": { "@affine/env": "workspace:*", diff --git a/yarn.lock b/yarn.lock index 6bbd6aafd6..c7639c1470 100644 --- a/yarn.lock +++ b/yarn.lock @@ -405,6 +405,7 @@ __metadata: "@electron-forge/core": "npm:^6.4.2" "@electron-forge/core-utils": "npm:^6.4.2" "@electron-forge/maker-deb": "npm:^6.4.2" + "@electron-forge/maker-dmg": "npm:^6.4.2" "@electron-forge/maker-squirrel": "npm:^6.4.2" "@electron-forge/maker-zip": "npm:^6.4.2" "@electron-forge/shared-types": "npm:^6.4.2" @@ -4121,6 +4122,21 @@ __metadata: languageName: node linkType: hard +"@electron-forge/maker-dmg@npm:^6.4.2": + version: 6.4.2 + resolution: "@electron-forge/maker-dmg@npm:6.4.2" + dependencies: + "@electron-forge/maker-base": "npm:6.4.2" + "@electron-forge/shared-types": "npm:6.4.2" + electron-installer-dmg: "npm:^4.0.0" + fs-extra: "npm:^10.0.0" + dependenciesMeta: + electron-installer-dmg: + optional: true + checksum: c83689f929d19dee23fd34644f50b56eec93917a1f069243969621706e8267c3474aca50c457b1ce52aa4c0e2b0f6fc76fedd9b4cbd08cd070f9c4e161a51565 + languageName: node + linkType: hard + "@electron-forge/maker-squirrel@npm:^6.4.2": version: 6.4.2 resolution: "@electron-forge/maker-squirrel@npm:6.4.2" @@ -15163,6 +15179,27 @@ __metadata: languageName: node linkType: hard +"appdmg@npm:^0.6.4": + version: 0.6.6 + resolution: "appdmg@npm:0.6.6" + dependencies: + async: "npm:^1.4.2" + ds-store: "npm:^0.1.5" + execa: "npm:^1.0.0" + fs-temp: "npm:^1.0.0" + fs-xattr: "npm:^0.3.0" + image-size: "npm:^0.7.4" + is-my-json-valid: "npm:^2.20.0" + minimist: "npm:^1.1.3" + parse-color: "npm:^1.0.0" + path-exists: "npm:^4.0.0" + repeat-string: "npm:^1.5.4" + bin: + appdmg: bin/appdmg.js + conditions: os=darwin + languageName: node + linkType: hard + "append-field@npm:^1.0.0": version: 1.0.0 resolution: "append-field@npm:1.0.0" @@ -15516,6 +15553,13 @@ __metadata: languageName: node linkType: hard +"async@npm:^1.4.2": + version: 1.5.2 + resolution: "async@npm:1.5.2" + checksum: 8afcdcee05168250926a3e7bd4dfaa74b681a74f634bae2af424fb716042461cbd20a375d9bc2534daa50a2d45286c9b174952fb239cee4ab8d6351a40c65327 + languageName: node + linkType: hard + "async@npm:^3.2.3": version: 3.2.4 resolution: "async@npm:3.2.4" @@ -15894,6 +15938,15 @@ __metadata: languageName: node linkType: hard +"base32-encode@npm:^0.1.0 || ^1.0.0": + version: 1.2.0 + resolution: "base32-encode@npm:1.2.0" + dependencies: + to-data-view: "npm:^1.1.0" + checksum: b8df667599d50b2c9fca206fcab9bf6500d2e980b14da204eb7de5ce978c99e4874e8138d109bd88d5bca1bfb5ae83926bca37b084d2c9842f8acb12b4b839d9 + languageName: node + linkType: hard + "base64-arraybuffer@npm:^1.0.2": version: 1.0.2 resolution: "base64-arraybuffer@npm:1.0.2" @@ -16094,6 +16147,15 @@ __metadata: languageName: node linkType: hard +"bplist-creator@npm:~0.0.3": + version: 0.0.8 + resolution: "bplist-creator@npm:0.0.8" + dependencies: + stream-buffers: "npm:~2.2.0" + checksum: f21a5a521f610027ab3ded29ff8e6b91cba31ef496ec0a4dec14c73bb95a787211dd93558ceef26c40cff7aaf35326811753b4be1476bac97e6e8c0ec6d16147 + languageName: node + linkType: hard + "bplist-parser@npm:^0.2.0": version: 0.2.0 resolution: "bplist-parser@npm:0.2.0" @@ -17097,6 +17159,13 @@ __metadata: languageName: node linkType: hard +"color-convert@npm:~0.5.0": + version: 0.5.3 + resolution: "color-convert@npm:0.5.3" + checksum: 00dc4256c07ed8760d7bbba234ff969c139eb964fe165853696852001002695c492e327d83ddb7a8cad8d27b49fa543d001328928c12474ee8ecb335bf5f2eb4 + languageName: node + linkType: hard + "color-name@npm:1.1.3": version: 1.1.3 resolution: "color-name@npm:1.1.3" @@ -18876,6 +18945,17 @@ __metadata: languageName: node linkType: hard +"ds-store@npm:^0.1.5": + version: 0.1.6 + resolution: "ds-store@npm:0.1.6" + dependencies: + bplist-creator: "npm:~0.0.3" + macos-alias: "npm:~0.2.5" + tn1150: "npm:^0.1.0" + checksum: afd033ddf3c2f5ed08bdf7ceb0d6dba480b27fed925cadcfde98dea86fc7f6af35da9cbebfac9bcfb31d11c725b5b111af044ea3f38ab4dde982b8a3424bd2d3 + languageName: node + linkType: hard + "dset@npm:^3.1.2": version: 3.1.2 resolution: "dset@npm:3.1.2" @@ -18984,6 +19064,22 @@ __metadata: languageName: node linkType: hard +"electron-installer-dmg@npm:^4.0.0": + version: 4.0.0 + resolution: "electron-installer-dmg@npm:4.0.0" + dependencies: + appdmg: "npm:^0.6.4" + debug: "npm:^4.3.2" + minimist: "npm:^1.1.1" + dependenciesMeta: + appdmg: + optional: true + bin: + electron-installer-dmg: bin/electron-installer-dmg.js + checksum: 0434871266fc06ce0150d2bbd05397e5a7ec219dc91abee2a604f9e49a27e874254ac8e9bcc4bd9bf713f18f98532562de9434510430071d89090cc8f3b6defd + languageName: node + linkType: hard + "electron-log@npm:^5.0.0-rc.1": version: 5.0.0-rc.1 resolution: "electron-log@npm:5.0.0-rc.1" @@ -19168,6 +19264,13 @@ __metadata: languageName: node linkType: hard +"encode-utf8@npm:^1.0.3": + version: 1.0.3 + resolution: "encode-utf8@npm:1.0.3" + checksum: 0204c37cda21bf19bb8f87f7ec6c89a23d43488c2ef1e5cfa40b64ee9568e63e15dc323fa7f50a491e2c6d33843a6b409f6de09afbf6cf371cb8da596cc64b44 + languageName: node + linkType: hard + "encodeurl@npm:~1.0.2": version: 1.0.2 resolution: "encodeurl@npm:1.0.2" @@ -20909,6 +21012,15 @@ __metadata: languageName: node linkType: hard +"fmix@npm:^0.1.0": + version: 0.1.0 + resolution: "fmix@npm:0.1.0" + dependencies: + imul: "npm:^1.0.0" + checksum: c465344d4f169eaf10d45c33949a1e7a633f09dba2ac7063ce8ae8be743df5979d708f7f24900163589f047f5194ac5fc2476177ce31175e8805adfa7b8fb7a4 + languageName: node + linkType: hard + "follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.0": version: 1.15.3 resolution: "follow-redirects@npm:1.15.3" @@ -21140,6 +21252,24 @@ __metadata: languageName: node linkType: hard +"fs-temp@npm:^1.0.0": + version: 1.2.1 + resolution: "fs-temp@npm:1.2.1" + dependencies: + random-path: "npm:^0.1.0" + checksum: 64d1b96c7adc172a0fbe6116f425f3588ac585dc7011524174e539df7794a4ca81874bb1c8ee74a47991cc35b7dc036f5bf880074844b2165027042b346b38d9 + languageName: node + linkType: hard + +"fs-xattr@npm:^0.3.0": + version: 0.3.1 + resolution: "fs-xattr@npm:0.3.1" + dependencies: + node-gyp: "npm:latest" + conditions: "!os=win32" + languageName: node + linkType: hard + "fs.realpath@npm:^1.0.0": version: 1.0.0 resolution: "fs.realpath@npm:1.0.0" @@ -21271,6 +21401,24 @@ __metadata: languageName: node linkType: hard +"generate-function@npm:^2.0.0": + version: 2.3.1 + resolution: "generate-function@npm:2.3.1" + dependencies: + is-property: "npm:^1.0.2" + checksum: 318f85af87c3258d86df4ebbb56b63a2ae52e71bd6cde8d0a79de09450de7422a7047fb1f8d52ccc135564a36cb986d73c63149eed96b7ac57e38acba44f29e2 + languageName: node + linkType: hard + +"generate-object-property@npm:^1.1.0": + version: 1.2.0 + resolution: "generate-object-property@npm:1.2.0" + dependencies: + is-property: "npm:^1.0.0" + checksum: 5141ca5fd545f0aabd24fd13f9f3ecf9cfea2255db00d46e282d65141d691d560c70b6361c3c0c4982f86f600361925bfd4773e0350c66d0210e6129ae553a09 + languageName: node + linkType: hard + "gensync@npm:^1.0.0-beta.2": version: 1.0.0-beta.2 resolution: "gensync@npm:1.0.0-beta.2" @@ -22586,6 +22734,15 @@ __metadata: languageName: node linkType: hard +"image-size@npm:^0.7.4": + version: 0.7.5 + resolution: "image-size@npm:0.7.5" + bin: + image-size: bin/image-size.js + checksum: 7254eef24c37f18348b35aa820b0057a513b02592a47457e5526a914fae2082db6ef8afcfd86119c866e72f4bdefb28128ae4880d2f14dbd9bd69b0d5c09babd + languageName: node + linkType: hard + "immediate@npm:~3.0.5": version: 3.0.6 resolution: "immediate@npm:3.0.6" @@ -22655,6 +22812,13 @@ __metadata: languageName: node linkType: hard +"imul@npm:^1.0.0": + version: 1.0.1 + resolution: "imul@npm:1.0.1" + checksum: 6c2af3d5f09e2135e14d565a2c108412b825b221eb2c881f9130467f2adccf7ae201773ae8bcf1be169e2d090567a1fdfa9cf20d3b7da7b9cecb95b920ff3e52 + languageName: node + linkType: hard + "imurmurhash@npm:^0.1.4": version: 0.1.4 resolution: "imurmurhash@npm:0.1.4" @@ -23032,6 +23196,26 @@ __metadata: languageName: node linkType: hard +"is-my-ip-valid@npm:^1.0.0": + version: 1.0.1 + resolution: "is-my-ip-valid@npm:1.0.1" + checksum: 97d28349e64b0c127f8e1c3c3f4fb92dfaadea7d34b67c43bbd9fe06d473fca66f3e1fd013b0a7c4b762db992d49a01af91b9cc994fac71db0cefb383f634ec6 + languageName: node + linkType: hard + +"is-my-json-valid@npm:^2.20.0": + version: 2.20.6 + resolution: "is-my-json-valid@npm:2.20.6" + dependencies: + generate-function: "npm:^2.0.0" + generate-object-property: "npm:^1.1.0" + is-my-ip-valid: "npm:^1.0.0" + jsonpointer: "npm:^5.0.0" + xtend: "npm:^4.0.0" + checksum: 0c23fb1ead07442269d52e58d2a62796d091e3f4741dbd1e25a689e1bcad15d9351abd8c90a62a9a3e75a3a6104e6ca94699db55c536114ff1f94b54067a0ff9 + languageName: node + linkType: hard + "is-nan@npm:^1.3.2": version: 1.3.2 resolution: "is-nan@npm:1.3.2" @@ -23135,6 +23319,13 @@ __metadata: languageName: node linkType: hard +"is-property@npm:^1.0.0, is-property@npm:^1.0.2": + version: 1.0.2 + resolution: "is-property@npm:1.0.2" + checksum: 2f66eacb3d7237ba5c725496672edec656a20b12c80790921988578e6b11c258a062ce1e602f3cd2e3c2e05dd8b6e24e1d59254375207f157424a02ef0abb3d7 + languageName: node + linkType: hard + "is-regexp@npm:^1.0.0": version: 1.0.0 resolution: "is-regexp@npm:1.0.0" @@ -24506,7 +24697,7 @@ __metadata: languageName: node linkType: hard -"jsonpointer@npm:^5.0.1": +"jsonpointer@npm:^5.0.0, jsonpointer@npm:^5.0.1": version: 5.0.1 resolution: "jsonpointer@npm:5.0.1" checksum: 0b40f712900ad0c846681ea2db23b6684b9d5eedf55807b4708c656f5894b63507d0e28ae10aa1bddbea551241035afe62b6df0800fc94c2e2806a7f3adecd7c @@ -25627,6 +25818,16 @@ __metadata: languageName: node linkType: hard +"macos-alias@npm:~0.2.5": + version: 0.2.11 + resolution: "macos-alias@npm:0.2.11" + dependencies: + nan: "npm:^2.4.0" + node-gyp: "npm:latest" + conditions: os=darwin + languageName: node + linkType: hard + "madge@npm:^6.1.0": version: 6.1.0 resolution: "madge@npm:6.1.0" @@ -26325,7 +26526,7 @@ __metadata: languageName: node linkType: hard -"minimist@npm:^1.1.0, minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.7, minimist@npm:~1.2.5": +"minimist@npm:^1.1.0, minimist@npm:^1.1.1, minimist@npm:^1.1.3, minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.7, minimist@npm:~1.2.5": version: 1.2.8 resolution: "minimist@npm:1.2.8" checksum: 908491b6cc15a6c440ba5b22780a0ba89b9810e1aea684e253e43c4e3b8d56ec1dcdd7ea96dde119c29df59c936cde16062159eae4225c691e19c70b432b6e6f @@ -26667,6 +26868,17 @@ __metadata: languageName: node linkType: hard +"murmur-32@npm:^0.1.0 || ^0.2.0": + version: 0.2.0 + resolution: "murmur-32@npm:0.2.0" + dependencies: + encode-utf8: "npm:^1.0.3" + fmix: "npm:^0.1.0" + imul: "npm:^1.0.0" + checksum: 0a1132cbfc6d8a0409db66e0c874c6c80898bc67b256f5896c0d8d91693febd072f6b73bd8fc602f06a87b375fcef50f4b03ddc2b71ae00b042f6f62c6baaadf + languageName: node + linkType: hard + "mustache@npm:^4.2.0": version: 4.2.0 resolution: "mustache@npm:4.2.0" @@ -26683,6 +26895,15 @@ __metadata: languageName: node linkType: hard +"nan@npm:^2.4.0": + version: 2.18.0 + resolution: "nan@npm:2.18.0" + dependencies: + node-gyp: "npm:latest" + checksum: 5520e22c64e2b5b495b1d765d6334c989b848bbe1502fec89c5857cabcc7f9f0474563377259e7574bff1c8a041d3b90e9ffa1f5e15502ffddee7b2550cc26a0 + languageName: node + linkType: hard + "nanoid@npm:^3.3.3, nanoid@npm:^3.3.6": version: 3.3.6 resolution: "nanoid@npm:3.3.6" @@ -27904,6 +28125,15 @@ __metadata: languageName: node linkType: hard +"parse-color@npm:^1.0.0": + version: 1.0.0 + resolution: "parse-color@npm:1.0.0" + dependencies: + color-convert: "npm:~0.5.0" + checksum: 9f988462af30929acbbce135286ce20dc2fb8efe48fd0693ed8bfd7da3a60e2465cffff6d35047fe94fd7863b43159bf41b377a9982939b7c65fdba1e30af24a + languageName: node + linkType: hard + "parse-duration@npm:^1.1.0": version: 1.1.0 resolution: "parse-duration@npm:1.1.0" @@ -29359,6 +29589,16 @@ __metadata: languageName: node linkType: hard +"random-path@npm:^0.1.0": + version: 0.1.2 + resolution: "random-path@npm:0.1.2" + dependencies: + base32-encode: "npm:^0.1.0 || ^1.0.0" + murmur-32: "npm:^0.1.0 || ^0.2.0" + checksum: 581b9eea25da11ddff462f459e787befd8e28f662eca2c64ef721235a6c53b5cbde2f973a05e9d91cea7722f3622bd127f2bb34897b4700ef8d0926a69fb3d11 + languageName: node + linkType: hard + "randombytes@npm:^2.1.0": version: 2.1.0 resolution: "randombytes@npm:2.1.0" @@ -30238,6 +30478,13 @@ __metadata: languageName: node linkType: hard +"repeat-string@npm:^1.5.4": + version: 1.6.1 + resolution: "repeat-string@npm:1.6.1" + checksum: 1b809fc6db97decdc68f5b12c4d1a671c8e3f65ec4a40c238bc5200e44e85bcc52a54f78268ab9c29fcf5fe4f1343e805420056d1f30fa9a9ee4c2d93e3cc6c0 + languageName: node + linkType: hard + "require-directory@npm:^2.1.1": version: 2.1.1 resolution: "require-directory@npm:2.1.1" @@ -31682,6 +31929,13 @@ __metadata: languageName: node linkType: hard +"stream-buffers@npm:~2.2.0": + version: 2.2.0 + resolution: "stream-buffers@npm:2.2.0" + checksum: 79f897cead810383b4181e4ee56f4855a69b51c9da4c96b91ccca6ee6fe90b908bea9b304225bedd1a5e2c41d72bc88d3ada7f897b51f8ffae3593f7460ecbc8 + languageName: node + linkType: hard + "stream-shift@npm:^1.0.0": version: 1.0.1 resolution: "stream-shift@npm:1.0.1" @@ -32621,6 +32875,22 @@ __metadata: languageName: node linkType: hard +"tn1150@npm:^0.1.0": + version: 0.1.0 + resolution: "tn1150@npm:0.1.0" + dependencies: + unorm: "npm:^1.4.1" + checksum: ea560e04faebd21e814acf9ba27db280e56ef99d9ea7b68e49aeededbd2b624faa340f2d049c5e9f17258df68ab49063335d074565e3ff88c3d39c87808e098c + languageName: node + linkType: hard + +"to-data-view@npm:^1.1.0": + version: 1.1.0 + resolution: "to-data-view@npm:1.1.0" + checksum: 53bf818cf7ed4b481568085cfed5528b268efe1e95d0b90c2a45031de9cf40de91600771c046924348fdedbedb54f655f98e7bf1c51041ba06f0ec3f2fd53dc6 + languageName: node + linkType: hard + "to-fast-properties@npm:^2.0.0": version: 2.0.0 resolution: "to-fast-properties@npm:2.0.0" @@ -33315,6 +33585,13 @@ __metadata: languageName: node linkType: hard +"unorm@npm:^1.4.1": + version: 1.6.0 + resolution: "unorm@npm:1.6.0" + checksum: af09a4c656830173571a547605a185916eb5ee2a684374282edf318ef54882f9b25d00bfd44591b686a292d8130e083755a3317eca62753d56e18616e98e501b + languageName: node + linkType: hard + "unpipe@npm:1.0.0, unpipe@npm:~1.0.0": version: 1.0.0 resolution: "unpipe@npm:1.0.0"