From c5cd230e769efc2bd7df9dc7dc28cf682836b948 Mon Sep 17 00:00:00 2001 From: Diogo Mendes Matsubara Date: Wed, 19 Jun 2024 16:54:37 +0200 Subject: [PATCH 1/3] fix: allow skip estuary publish test --- .github/workflows/release-crates-cargo.yml | 9 +++++++++ dist/publish-crates-cargo-main.js | 12 ++++++++---- publish-crates-cargo/action.yml | 2 ++ src/publish-crates-cargo.ts | 15 ++++++++++----- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release-crates-cargo.yml b/.github/workflows/release-crates-cargo.yml index 8c3cb9a..d83b15a 100644 --- a/.github/workflows/release-crates-cargo.yml +++ b/.github/workflows/release-crates-cargo.yml @@ -18,6 +18,10 @@ on: unpublished-deps-repos: type: string required: false + installation-test: + type: boolean + required: true + default: true workflow_dispatch: inputs: repo: @@ -35,6 +39,10 @@ on: unpublished-deps-repos: type: string required: false + installation-test: + type: boolean + required: true + default: true jobs: publish: @@ -49,3 +57,4 @@ jobs: unpublished-deps-repos: ${{ inputs.unpublished-deps-repos }} github-token: ${{ secrets.BOT_TOKEN_WORKFLOW }} crates-io-token: ${{ secrets.CRATES_IO_TOKEN }} + installation-test: ${{ inputs.installation-test }} diff --git a/dist/publish-crates-cargo-main.js b/dist/publish-crates-cargo-main.js index 65e1c57..3b85401 100644 --- a/dist/publish-crates-cargo-main.js +++ b/dist/publish-crates-cargo-main.js @@ -81358,6 +81358,7 @@ function setup() { const cratesIoToken = _actions_core__WEBPACK_IMPORTED_MODULE_1__.getInput("crates-io-token", { required: true }); const unpublishedDepsPatterns = _actions_core__WEBPACK_IMPORTED_MODULE_1__.getInput("unpublished-deps-patterns"); const unpublishedDepsRepos = _actions_core__WEBPACK_IMPORTED_MODULE_1__.getInput("unpublished-deps-repos"); + const installationTest = _actions_core__WEBPACK_IMPORTED_MODULE_1__.getBooleanInput("installation-test", { required: true }); return { liveRun, branch, @@ -81366,17 +81367,20 @@ function setup() { unpublishedDepsRegExp: unpublishedDepsPatterns === "" ? /^$/ : new RegExp(unpublishedDepsPatterns.split("\n").join("|")), unpublishedDepsRepos: unpublishedDepsRepos === "" ? [] : unpublishedDepsRepos.split("\n"), cratesIoToken, + installationTest, }; } async function main(input) { let registry = undefined; try { registry = await _estuary__WEBPACK_IMPORTED_MODULE_2__/* .spawn */ .C(); - for (const repo of input.unpublishedDepsRepos) { - await publishToEstuary(input, repo, registry, input.unpublishedDepsRegExp); + if (input.installationTest) { + for (const repo of input.unpublishedDepsRepos) { + await publishToEstuary(input, repo, registry, input.unpublishedDepsRegExp); + } + await publishToEstuary(input, input.repo, registry, input.unpublishedDepsRegExp, input.branch); + await deleteRepos(input); } - await publishToEstuary(input, input.repo, registry, input.unpublishedDepsRegExp, input.branch); - await deleteRepos(input); if (input.liveRun) { for (const repo of input.unpublishedDepsRepos) { publishToCratesIo(input, repo); diff --git a/publish-crates-cargo/action.yml b/publish-crates-cargo/action.yml index 6582ad9..bd62f5b 100644 --- a/publish-crates-cargo/action.yml +++ b/publish-crates-cargo/action.yml @@ -15,6 +15,8 @@ inputs: required: false unpublished-deps-repos: required: false + installation-test: + required: true runs: using: node20 diff --git a/src/publish-crates-cargo.ts b/src/publish-crates-cargo.ts index 0738ddd..1ba5987 100644 --- a/src/publish-crates-cargo.ts +++ b/src/publish-crates-cargo.ts @@ -14,6 +14,7 @@ export type Input = { unpublishedDepsRegExp: RegExp; unpublishedDepsRepos: string[]; cratesIoToken?: string; + installationTest: boolean; }; export function setup(): Input { @@ -24,6 +25,7 @@ export function setup(): Input { const cratesIoToken = core.getInput("crates-io-token", { required: true }); const unpublishedDepsPatterns = core.getInput("unpublished-deps-patterns"); const unpublishedDepsRepos = core.getInput("unpublished-deps-repos"); + const installationTest = core.getBooleanInput("installation-test", { required: true }); return { liveRun, @@ -34,6 +36,7 @@ export function setup(): Input { unpublishedDepsPatterns === "" ? /^$/ : new RegExp(unpublishedDepsPatterns.split("\n").join("|")), unpublishedDepsRepos: unpublishedDepsRepos === "" ? [] : unpublishedDepsRepos.split("\n"), cratesIoToken, + installationTest, }; } @@ -42,13 +45,15 @@ export async function main(input: Input) { try { registry = await estuary.spawn(); - for (const repo of input.unpublishedDepsRepos) { - await publishToEstuary(input, repo, registry, input.unpublishedDepsRegExp); - } + if (input.installationTest) { + for (const repo of input.unpublishedDepsRepos) { + await publishToEstuary(input, repo, registry, input.unpublishedDepsRegExp); + } - await publishToEstuary(input, input.repo, registry, input.unpublishedDepsRegExp, input.branch); + await publishToEstuary(input, input.repo, registry, input.unpublishedDepsRegExp, input.branch); - await deleteRepos(input); + await deleteRepos(input); + } if (input.liveRun) { for (const repo of input.unpublishedDepsRepos) { From 2277039dca083d60d524d06b1034fe662853f74e Mon Sep 17 00:00:00 2001 From: Diogo Mendes Matsubara Date: Wed, 19 Jun 2024 17:34:17 +0200 Subject: [PATCH 2/3] fix: use publication-test publication-test makes more sense than installation-test for cargo publishing. --- .github/workflows/release-crates-cargo.yml | 6 +++--- dist/publish-crates-cargo-main.js | 6 +++--- publish-crates-cargo/action.yml | 2 +- src/publish-crates-cargo.ts | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release-crates-cargo.yml b/.github/workflows/release-crates-cargo.yml index d83b15a..b34c6b7 100644 --- a/.github/workflows/release-crates-cargo.yml +++ b/.github/workflows/release-crates-cargo.yml @@ -18,7 +18,7 @@ on: unpublished-deps-repos: type: string required: false - installation-test: + publication-test: type: boolean required: true default: true @@ -39,7 +39,7 @@ on: unpublished-deps-repos: type: string required: false - installation-test: + publication-test: type: boolean required: true default: true @@ -57,4 +57,4 @@ jobs: unpublished-deps-repos: ${{ inputs.unpublished-deps-repos }} github-token: ${{ secrets.BOT_TOKEN_WORKFLOW }} crates-io-token: ${{ secrets.CRATES_IO_TOKEN }} - installation-test: ${{ inputs.installation-test }} + publication-test: ${{ inputs.publication-test }} diff --git a/dist/publish-crates-cargo-main.js b/dist/publish-crates-cargo-main.js index 3b85401..871288f 100644 --- a/dist/publish-crates-cargo-main.js +++ b/dist/publish-crates-cargo-main.js @@ -81358,7 +81358,7 @@ function setup() { const cratesIoToken = _actions_core__WEBPACK_IMPORTED_MODULE_1__.getInput("crates-io-token", { required: true }); const unpublishedDepsPatterns = _actions_core__WEBPACK_IMPORTED_MODULE_1__.getInput("unpublished-deps-patterns"); const unpublishedDepsRepos = _actions_core__WEBPACK_IMPORTED_MODULE_1__.getInput("unpublished-deps-repos"); - const installationTest = _actions_core__WEBPACK_IMPORTED_MODULE_1__.getBooleanInput("installation-test", { required: true }); + const publicationTest = _actions_core__WEBPACK_IMPORTED_MODULE_1__.getBooleanInput("publication-test", { required: true }); return { liveRun, branch, @@ -81367,14 +81367,14 @@ function setup() { unpublishedDepsRegExp: unpublishedDepsPatterns === "" ? /^$/ : new RegExp(unpublishedDepsPatterns.split("\n").join("|")), unpublishedDepsRepos: unpublishedDepsRepos === "" ? [] : unpublishedDepsRepos.split("\n"), cratesIoToken, - installationTest, + publicationTest, }; } async function main(input) { let registry = undefined; try { registry = await _estuary__WEBPACK_IMPORTED_MODULE_2__/* .spawn */ .C(); - if (input.installationTest) { + if (input.publicationTest) { for (const repo of input.unpublishedDepsRepos) { await publishToEstuary(input, repo, registry, input.unpublishedDepsRegExp); } diff --git a/publish-crates-cargo/action.yml b/publish-crates-cargo/action.yml index bd62f5b..1ea6a2c 100644 --- a/publish-crates-cargo/action.yml +++ b/publish-crates-cargo/action.yml @@ -15,7 +15,7 @@ inputs: required: false unpublished-deps-repos: required: false - installation-test: + publication-test: required: true runs: diff --git a/src/publish-crates-cargo.ts b/src/publish-crates-cargo.ts index 1ba5987..12ba682 100644 --- a/src/publish-crates-cargo.ts +++ b/src/publish-crates-cargo.ts @@ -14,7 +14,7 @@ export type Input = { unpublishedDepsRegExp: RegExp; unpublishedDepsRepos: string[]; cratesIoToken?: string; - installationTest: boolean; + publicationTest: boolean; }; export function setup(): Input { @@ -25,7 +25,7 @@ export function setup(): Input { const cratesIoToken = core.getInput("crates-io-token", { required: true }); const unpublishedDepsPatterns = core.getInput("unpublished-deps-patterns"); const unpublishedDepsRepos = core.getInput("unpublished-deps-repos"); - const installationTest = core.getBooleanInput("installation-test", { required: true }); + const publicationTest = core.getBooleanInput("publication-test", { required: true }); return { liveRun, @@ -36,7 +36,7 @@ export function setup(): Input { unpublishedDepsPatterns === "" ? /^$/ : new RegExp(unpublishedDepsPatterns.split("\n").join("|")), unpublishedDepsRepos: unpublishedDepsRepos === "" ? [] : unpublishedDepsRepos.split("\n"), cratesIoToken, - installationTest, + publicationTest, }; } @@ -45,7 +45,7 @@ export async function main(input: Input) { try { registry = await estuary.spawn(); - if (input.installationTest) { + if (input.publicationTest) { for (const repo of input.unpublishedDepsRepos) { await publishToEstuary(input, repo, registry, input.unpublishedDepsRegExp); } From 8e824973a8793aa66d0948630967fd55b42c5edc Mon Sep 17 00:00:00 2001 From: Diogo Mendes Matsubara Date: Wed, 19 Jun 2024 17:47:56 +0200 Subject: [PATCH 3/3] fix: set publication-test to false by default To avoid updating all the workflow for all zenoh-* repos we set default to false for the 1.0.0-alpha.1 release and after the release is done we can set it back to true --- .github/workflows/release-crates-cargo.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-crates-cargo.yml b/.github/workflows/release-crates-cargo.yml index b34c6b7..84dcbe5 100644 --- a/.github/workflows/release-crates-cargo.yml +++ b/.github/workflows/release-crates-cargo.yml @@ -21,7 +21,7 @@ on: publication-test: type: boolean required: true - default: true + default: false workflow_dispatch: inputs: repo: @@ -42,7 +42,7 @@ on: publication-test: type: boolean required: true - default: true + default: false jobs: publish: