Added std lib files into installer #640
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,21 @@ | ||
| # This file was autogenerated by dist: https://opensource.axo.dev/cargo-dist/ | ||
| # | ||
| # Copyright 2022-2024, axodotdev | ||
| # SPDX-License-Identifier: MIT or Apache-2.0 | ||
| # | ||
| # CI that: | ||
| # | ||
| # * checks for a Git Tag that looks like a release | ||
| # * builds artifacts with dist (archives, installers, hashes) | ||
| # * uploads those artifacts to temporary workflow zip | ||
| # * on success, uploads the artifacts to a GitHub Release | ||
| # | ||
| # Note that the GitHub Release will be created with a generated | ||
| # title/body based on your changelogs. | ||
|
|
||
| name: Release | ||
| permissions: | ||
| "contents": "write" | ||
|
|
||
| # This task will run whenever you push a git tag that looks like a version | ||
| # like "1.0.0", "v0.1.0-prerelease.1", "my-app/0.1.0", "releases/v1.0.0", etc. | ||
|
|
@@ -23,10 +24,10 @@ permissions: | |
| # must be a Cargo-style SemVer Version (must have at least major.minor.patch). | ||
| # | ||
| # If PACKAGE_NAME is specified, then the announcement will be for that | ||
| # package (erroring out if it doesn't have the given version or isn't dist-able). | ||
| # | ||
| # If PACKAGE_NAME isn't specified, then the announcement will be for all | ||
| # (dist-able) packages in the workspace with that version (this mode is | ||
| # intended for workspaces with only one dist-able package, or with all dist-able | ||
| # packages versioned/released in lockstep). | ||
| # | ||
|
|
@@ -43,9 +44,9 @@ on: | |
| - '**[0-9]+.[0-9]+.[0-9]+*' | ||
|
|
||
| jobs: | ||
| # Run 'dist plan' (or host) to determine what tasks we need to do | ||
| plan: | ||
| runs-on: "ubuntu-20.04" | ||
|
There was a problem hiding this comment. Do we really need to target a specific version of Ubuntu, especially such an old one? (two LTS releases ago!) There was a problem hiding this comment. This was generated by |
||
| outputs: | ||
| val: ${{ steps.plan.outputs.manifest }} | ||
| tag: ${{ !github.event.pull_request && github.ref_name || '' }} | ||
|
|
@@ -57,20 +58,25 @@ jobs: | |
| - uses: actions/checkout@v4 | ||
| with: | ||
| submodules: recursive | ||
| - name: Install dist | ||
| # we specify bash to get pipefail; it guards against the `curl` command | ||
| # failing. otherwise `sh` won't catch that `curl` returned non-0 | ||
| shell: bash | ||
| run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.27.0/cargo-dist-installer.sh | sh" | ||
| - name: Cache dist | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: cargo-dist-cache | ||
| path: ~/.cargo/bin/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. | ||
| # (PRs run on the *source* but secrets are usually on the *target* -- that's *good* | ||
| # but also really annoying to build CI around when it needs secrets to work right.) | ||
| - id: plan | ||
| run: | | ||
| dist ${{ (!github.event.pull_request && format('host --steps=create --tag={0}', github.ref_name)) || 'plan' }} --output-format=json > plan-dist-manifest.json | ||
| echo "dist ran successfully" | ||
| cat plan-dist-manifest.json | ||
| echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT" | ||
| - name: "Upload dist-manifest.json" | ||
|
|
@@ -88,18 +94,19 @@ jobs: | |
| if: ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix.include != null && (needs.plan.outputs.publishing == 'true' || fromJson(needs.plan.outputs.val).ci.github.pr_run_mode == 'upload') }} | ||
| strategy: | ||
| fail-fast: false | ||
| # Target platforms/runners are computed by dist in create-release. | ||
| # Each member of the matrix has the following arguments: | ||
| # | ||
| # - runner: the github runner | ||
| # - dist-args: cli flags to pass to dist | ||
| # - install-dist: expression to run to install dist on the runner | ||
| # | ||
| # Typically there will be: | ||
| # - 1 "global" task that builds universal installers | ||
| # - N "local" tasks that build each platform's binaries and platform-specific installers | ||
| matrix: ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix }} | ||
| runs-on: ${{ matrix.runner }} | ||
| container: ${{ matrix.container && matrix.container.image || null }} | ||
| env: | ||
| GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| BUILD_MANIFEST_NAME: target/distrib/${{ join(matrix.targets, '-') }}-dist-manifest.json | ||
|
|
@@ -110,11 +117,15 @@ jobs: | |
| - uses: actions/checkout@v4 | ||
| with: | ||
| submodules: recursive | ||
| - name: Install Rust non-interactively if not already installed | ||
| if: ${{ matrix.container }} | ||
| run: | | ||
| if ! command -v cargo > /dev/null 2>&1; then | ||
| curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y | ||
| echo "$HOME/.cargo/bin" >> $GITHUB_PATH | ||
| fi | ||
| - name: Install dist | ||
| run: ${{ matrix.install_dist.run }} | ||
| # Get the dist-manifest | ||
| - name: Fetch local artifacts | ||
| uses: actions/download-artifact@v4 | ||
|
|
@@ -128,8 +139,8 @@ jobs: | |
| - name: Build artifacts | ||
| run: | | ||
| # Actually do builds and make zips and whatnot | ||
| dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json | ||
| echo "dist ran successfully" | ||
| - id: cargo-dist | ||
| name: Post-build | ||
| # We force bash here just because github makes it really hard to get values up | ||
|
|
@@ -139,7 +150,7 @@ jobs: | |
| run: | | ||
| # Parse out what we just built and upload it to scratch storage | ||
| echo "paths<<EOF" >> "$GITHUB_OUTPUT" | ||
| dist print-upload-files-from-manifest --manifest dist-manifest.json >> "$GITHUB_OUTPUT" | ||
| echo "EOF" >> "$GITHUB_OUTPUT" | ||
|
|
||
| cp dist-manifest.json "$BUILD_MANIFEST_NAME" | ||
|
|
@@ -164,40 +175,28 @@ jobs: | |
| - uses: actions/checkout@v4 | ||
| with: | ||
| submodules: recursive | ||
| - name: Install cached dist | ||
| uses: actions/download-artifact@v4 | ||
| with: | ||
| name: cargo-dist-cache | ||
| path: ~/.cargo/bin/ | ||
| - run: chmod +x ~/.cargo/bin/dist | ||
| # Get all the local artifacts for the global tasks to use (for e.g. checksums) | ||
| - name: Fetch local artifacts | ||
| uses: actions/download-artifact@v4 | ||
| with: | ||
| pattern: artifacts-* | ||
| path: target/distrib/ | ||
| merge-multiple: true | ||
| - id: cargo-dist | ||
| shell: bash | ||
| run: | | ||
| dist build ${{ needs.plan.outputs.tag-flag }} --output-format=json "--artifacts=global" > dist-manifest.json | ||
| echo "dist ran successfully" | ||
|
|
||
| # Parse out what we just built and upload it to scratch storage | ||
| echo "paths<<EOF" >> "$GITHUB_OUTPUT" | ||
| jq --raw-output ".upload_files[]" dist-manifest.json >> "$GITHUB_OUTPUT" | ||
| echo "EOF" >> "$GITHUB_OUTPUT" | ||
|
|
||
| cp dist-manifest.json "$BUILD_MANIFEST_NAME" | ||
|
|
@@ -225,20 +224,23 @@ jobs: | |
| - uses: actions/checkout@v4 | ||
| with: | ||
| submodules: recursive | ||
| - name: Install cached dist | ||
| uses: actions/download-artifact@v4 | ||
| with: | ||
| name: cargo-dist-cache | ||
| path: ~/.cargo/bin/ | ||
| - run: chmod +x ~/.cargo/bin/dist | ||
| # Fetch artifacts from scratch-storage | ||
| - name: Fetch artifacts | ||
| uses: actions/download-artifact@v4 | ||
| with: | ||
| pattern: artifacts-* | ||
| path: target/distrib/ | ||
| merge-multiple: true | ||
| - id: host | ||
| shell: bash | ||
| run: | | ||
| dist host ${{ needs.plan.outputs.tag-flag }} --steps=upload --steps=release --output-format=json > dist-manifest.json | ||
| echo "artifacts uploaded and released successfully" | ||
| cat dist-manifest.json | ||
| echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT" | ||
|
|
@@ -248,8 +250,29 @@ jobs: | |
| # Overwrite the previous copy | ||
| name: artifacts-dist-manifest | ||
| path: dist-manifest.json | ||
| # Create a GitHub Release while uploading all files to it | ||
| - name: "Download GitHub Artifacts" | ||
| uses: actions/download-artifact@v4 | ||
| with: | ||
| pattern: artifacts-* | ||
| path: artifacts | ||
| merge-multiple: true | ||
| - name: Cleanup | ||
| run: | | ||
| # Remove the granular manifests | ||
| rm -f artifacts/*-dist-manifest.json | ||
| - name: Create GitHub Release | ||
| env: | ||
| PRERELEASE_FLAG: "${{ fromJson(steps.host.outputs.manifest).announcement_is_prerelease && '--prerelease' || '' }}" | ||
| ANNOUNCEMENT_TITLE: "${{ fromJson(steps.host.outputs.manifest).announcement_title }}" | ||
| ANNOUNCEMENT_BODY: "${{ fromJson(steps.host.outputs.manifest).announcement_github_body }}" | ||
| RELEASE_COMMIT: "${{ github.sha }}" | ||
| run: | | ||
| # Write and read notes from a file to avoid quoting breaking things | ||
| echo "$ANNOUNCEMENT_BODY" > $RUNNER_TEMP/notes.txt | ||
|
|
||
| gh release create "${{ needs.plan.outputs.tag }}" --target "$RELEASE_COMMIT" $PRERELEASE_FLAG --title "$ANNOUNCEMENT_TITLE" --notes-file "$RUNNER_TEMP/notes.txt" artifacts/* | ||
|
|
||
| announce: | ||
| needs: | ||
| - plan | ||
|
|
@@ -265,23 +288,3 @@ jobs: | |
| - uses: actions/checkout@v4 | ||
| with: | ||
| submodules: recursive | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| [workspace] | ||
| members = ["cargo:."] | ||
|
|
||
| # Config for 'dist' | ||
| [dist] | ||
| # The preferred dist version to use in CI (Cargo.toml SemVer syntax) | ||
| cargo-dist-version = "0.27.0" | ||
| # CI backends to support | ||
| ci = "github" | ||
| # The installers to generate for each app | ||
| installers = ["shell"] | ||
| # Target platforms to build apps for (Rust target-triple syntax) | ||
| targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "aarch64-pc-windows-msvc", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"] | ||
| # Skip checking whether the specified configuration files are up to date | ||
| allow-dirty = ["ci"] | ||
| # Path that installers should place binaries in | ||
| install-path = "CARGO_HOME" | ||
| # Whether to install an updater program | ||
| install-updater = true | ||
| # Extra static files to include in each App (path relative to this Cargo.toml's dir) | ||
| include = ["std", "assets"] | ||
| # Success installation message | ||
| custom-success-msg = "Amber has been installed successfully. 🎉\n> Now you can use amber by typing `amber` in your terminal." |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems unnecessary to add quotes around either name or value here. There may be specific reasons why it's necessary, but YAML itself has no such requirement.