From 79a01bd3ff4670d188092547a2a335edab5f0a19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Misty=20De=20M=C3=A9o?= Date: Tue, 28 Nov 2023 09:10:46 -0800 Subject: [PATCH] Temporarily enable upload mode --- .github/workflows/release.yml | 6 +++--- Cargo.toml | 4 ++-- cargo-dist/tests/snapshots/lib_manifest.snap | 2 +- cargo-dist/tests/snapshots/lib_manifest_slash.snap | 2 +- cargo-dist/tests/snapshots/manifest.snap | 12 ++++++------ 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3c54cd6e2..071e03b11 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,7 +59,7 @@ jobs: with: submodules: recursive - name: Install cargo-dist - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.5.0/cargo-dist-installer.sh | sh" + run: "cargo install --git https://github.com/axodotdev/cargo-dist/ --branch=extra-artifacts cargo-dist" # sure would be cool if github gave us proper conditionals... # so here's a doubly-nested ternary-via-truthiness to try to provide the best possible # functionality based on whether this is a pull_request, and whether it's from a fork. @@ -156,7 +156,7 @@ jobs: with: submodules: recursive - name: Install cargo-dist - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.5.0/cargo-dist-installer.sh | sh" + run: "cargo install --git https://github.com/axodotdev/cargo-dist/ --branch=extra-artifacts cargo-dist" # Get all the local artifacts for the global tasks to use (for e.g. checksums) - name: Fetch local artifacts uses: actions/download-artifact@v3 @@ -200,7 +200,7 @@ jobs: with: submodules: recursive - name: Install cargo-dist - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.5.0/cargo-dist-installer.sh | sh" + run: "cargo install --git https://github.com/axodotdev/cargo-dist/ --branch=extra-artifacts cargo-dist" # Fetch artifacts from scratch-storage - name: Fetch artifacts uses: actions/download-artifact@v3 diff --git a/Cargo.toml b/Cargo.toml index fdfd078ad..b2ce92831 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ publish = false # Config for 'cargo dist' [workspace.metadata.dist] # The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax) -cargo-dist-version = "0.5.0" +cargo-dist-version = "0.5.0-github-extra-artifacts" # CI backends to support ci = ["github"] # The installers to generate for each app @@ -26,7 +26,7 @@ publish-jobs = ["homebrew"] # Target platforms to build apps for (Rust target-triple syntax) targets = ["x86_64-unknown-linux-gnu", "aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"] # Publish jobs to run in CI -pr-run-mode = "plan" +pr-run-mode = "upload" [[workspace.metadata.dist.extra-artifacts]] artifacts = ["dist-manifest-schema.json"] diff --git a/cargo-dist/tests/snapshots/lib_manifest.snap b/cargo-dist/tests/snapshots/lib_manifest.snap index b9f6829c6..bd83f1769 100644 --- a/cargo-dist/tests/snapshots/lib_manifest.snap +++ b/cargo-dist/tests/snapshots/lib_manifest.snap @@ -28,7 +28,7 @@ stdout: "ci": { "github": { "artifacts_matrix": {}, - "pr_run_mode": "plan" + "pr_run_mode": "upload" } }, "linkage": [] diff --git a/cargo-dist/tests/snapshots/lib_manifest_slash.snap b/cargo-dist/tests/snapshots/lib_manifest_slash.snap index b07c1764e..f13bfa6dc 100644 --- a/cargo-dist/tests/snapshots/lib_manifest_slash.snap +++ b/cargo-dist/tests/snapshots/lib_manifest_slash.snap @@ -28,7 +28,7 @@ stdout: "ci": { "github": { "artifacts_matrix": {}, - "pr_run_mode": "plan" + "pr_run_mode": "upload" } }, "linkage": [] diff --git a/cargo-dist/tests/snapshots/manifest.snap b/cargo-dist/tests/snapshots/manifest.snap index 5a7688f78..7ddf8709b 100644 --- a/cargo-dist/tests/snapshots/manifest.snap +++ b/cargo-dist/tests/snapshots/manifest.snap @@ -310,7 +310,7 @@ stdout: "aarch64-apple-darwin" ], "runner": "macos-11", - "install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh", + "install_dist": "cargo install --git https://github.com/axodotdev/cargo-dist/ --branch=extra-artifacts cargo-dist", "dist_args": "--artifacts=local --target=aarch64-apple-darwin" }, { @@ -318,7 +318,7 @@ stdout: "x86_64-apple-darwin" ], "runner": "macos-11", - "install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh", + "install_dist": "cargo install --git https://github.com/axodotdev/cargo-dist/ --branch=extra-artifacts cargo-dist", "dist_args": "--artifacts=local --target=x86_64-apple-darwin" }, { @@ -326,7 +326,7 @@ stdout: "x86_64-pc-windows-msvc" ], "runner": "windows-2019", - "install_dist": "irm https://github.com/axodotdev/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.ps1 | iex", + "install_dist": "cargo install --git https://github.com/axodotdev/cargo-dist/ --branch=extra-artifacts cargo-dist", "dist_args": "--artifacts=local --target=x86_64-pc-windows-msvc" }, { @@ -334,7 +334,7 @@ stdout: "x86_64-unknown-linux-gnu" ], "runner": "ubuntu-20.04", - "install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh", + "install_dist": "cargo install --git https://github.com/axodotdev/cargo-dist/ --branch=extra-artifacts cargo-dist", "dist_args": "--artifacts=local --target=x86_64-unknown-linux-gnu" }, { @@ -342,13 +342,13 @@ stdout: "x86_64-unknown-linux-musl" ], "runner": "ubuntu-20.04", - "install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v1.0.0-FAKEVERSION/cargo-dist-installer.sh | sh", + "install_dist": "cargo install --git https://github.com/axodotdev/cargo-dist/ --branch=extra-artifacts cargo-dist", "dist_args": "--artifacts=local --target=x86_64-unknown-linux-musl", "packages_install": "sudo apt-get install musl-tools" } ] }, - "pr_run_mode": "plan" + "pr_run_mode": "upload" } }, "linkage": []