diff --git a/.github/workflows/build-linux-pkgs.yml b/.github/workflows/build-linux-pkgs.yml deleted file mode 100644 index d2b0015..0000000 --- a/.github/workflows/build-linux-pkgs.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Linux Packages - -on: - # Defining workflow_call means that this workflow can be called from - # your main workflow job - workflow_call: - # cargo-dist exposes the plan from the plan step, as a JSON string, - # to your job if it needs it - inputs: - plan: - required: true - type: string - -jobs: - linux-pkg: - runs-on: ubuntu-latest - # This is optional; it exposes the plan to your job as an environment variable - env: - PLAN: ${{ inputs.plan }} - steps: - - uses: actions/checkout@v4 - # Fetch artifacts from scratch-storage - - name: Fetch artifacts - uses: actions/download-artifact@v4 - with: - pattern: artifacts-*-linux-gnu - path: target/distrib/ - merge-multiple: true - - name: Create archive - run: | - VERSION="$(echo "$PLAN" | jq --compact-output '.releases | first | .app_version')" - tar -xvf target/distrib/dev-scope-x86_64-unknown-linux-gnu.tar.xz -C target - tar -xvf target/distrib/dev-scope-aarch64-unknown-linux-gnu.tar.xz -C target - .github/bin/create-packages-linux.sh ${VERSION} - - name: Upload Linux - uses: actions/upload-artifact@v4 - with: - name: artifacts-linux-pkgs - path: | - target/upload/scope-*-1.aarch64.rpm - target/upload/scope-*-1.aarch64.rpm.sha256 - target/upload/scope-*-1.x86_64.rpm - target/upload/scope-*-1.x86_64.rpm.sha256 - target/upload/scope_*_amd64.deb - target/upload/scope_*_amd64.deb.sha256 - target/upload/scope_*_arm64.deb - target/upload/scope_*_arm64.deb.sha256 - if-no-files-found: error diff --git a/.github/workflows/dotslash-config.json b/.github/workflows/dotslash-config.json deleted file mode 100644 index 126bca1..0000000 --- a/.github/workflows/dotslash-config.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "outputs": { - "scope": { - "platforms": { - "macos-x86_64": { - "regex": "^dev-scope-aarch64-apple-darwin", - "format": "tar.xz", - "path": "dev-scope-aarch64-apple-darwin/scope" - }, - "macos-aarch64": { - "regex": "^dev-scope-aarch64-apple-darwin", - "format": "tar.xz", - "path": "dev-scope-aarch64-apple-darwin/scope" - }, - "linux-aarch64": { - "regex": "^dev-scope-aarch64-unknown-linux-gnu", - "format": "tar.xz", - "path": "dev-scope-aarch64-unknown-linux-gnu/scope" - }, - "linux-x86_64": { - "regex": "^dev-scope-x86_64-unknown-linux-gnu", - "format": "tar.xz", - "path": "dev-scope-x86_64-unknown-linux-gnu/scope" - } - } - }, - "scope-intercept": { - "platforms": { - "macos-x86_64": { - "regex": "^dev-scope-aarch64-apple-darwin", - "format": "tar.xz", - "path": "dev-scope-aarch64-apple-darwin/scope-intercept" - }, - "macos-aarch64": { - "regex": "^dev-scope-aarch64-apple-darwin", - "format": "tar.xz", - "path": "dev-scope-aarch64-apple-darwin/scope-intercept" - }, - "linux-aarch64": { - "regex": "^dev-scope-aarch64-unknown-linux-gnu", - "format": "tar.xz", - "path": "dev-scope-aarch64-unknown-linux-gnu/scope-intercept" - }, - "linux-x86_64": { - "regex": "^dev-scope-x86_64-unknown-linux-gnu", - "format": "tar.xz", - "path": "dev-scope-x86_64-unknown-linux-gnu/scope-intercept" - } - } - } - } -} \ No newline at end of file diff --git a/.github/workflows/dotslash.yml b/.github/workflows/dotslash.yml deleted file mode 100644 index c055ac8..0000000 --- a/.github/workflows/dotslash.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Generate DotSlash files - -on: - workflow_call: - inputs: - plan: - required: true - type: string - -jobs: - generate-dotslash-files: - name: Generating and uploading DotSlash files - runs-on: ubuntu-latest - env: - PLAN: ${{ inputs.plan }} - steps: - - name: Get release tag - id: version - run: | - VERSION="$(echo "$PLAN" | jq -r --compact-output '.announcement_tag')" - echo $VERSION - echo "version=${VERSION}" >> "$GITHUB_OUTPUT" - - uses: facebook/dotslash-publish-release@v1 - # This is necessary because the action uses - # `gh release upload` to publish the generated DotSlash file(s) - # as part of the release. - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - # Additional file that lives in your repo that defines - # how your DotSlash file(s) should be generated. - config: .github/workflows/dotslash-config.json - # Tag for the release to to target. - tag: ${{ steps.version.outputs.version }} diff --git a/.github/workflows/on-main.yml b/.github/workflows/on-main.yml deleted file mode 100644 index 25e4c21..0000000 --- a/.github/workflows/on-main.yml +++ /dev/null @@ -1,99 +0,0 @@ -on: - push: - branches: - - main - -name: Check Main and Create GitHub Release - -jobs: - check: - name: Check - runs-on: ubuntu-latest - if: ${{ github.actor != 'oscope-release-bot[bot]' && github.event.commits[0].author.name != 'dependabot[bot]' }} - steps: - - uses: actions/checkout@v4 - - run: rustup update - - uses: actions/cache@v4 - with: - path: | - ~/.cargo/bin - ~/.cargo/registry/index - ~/.cargo/registry/cache - ~/.cargo/git/db - target - key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - name: cargo build - run: cargo build - - name: cargo check - run: cargo check - ## Cargo test - - name: cargo test - run: cargo test - ## Cargo fmt - - run: rustup component add rustfmt - - name: cargo fmt - run: cargo fmt --all -- --check - ## Cargo clippy - - name: cargo clippy - run: cargo clippy -- -D warnings - - cut-release: - needs: - - check - runs-on: ubuntu-latest - name: Cut and Release New Version - steps: - - uses: actions/create-github-app-token@v1 - id: app-token - with: - app-id: ${{ vars.APP_ID }} - private-key: ${{ secrets.PRIVATE_KEY }} - - - name: Checkout repository - uses: actions/checkout@v4 - with: - token: ${{ steps.app-token.outputs.token }} - fetch-depth: 0 - - - uses: actions/cache@v4 - with: - path: | - ~/.cargo/bin - ~/.cargo/registry/index - ~/.cargo/registry/cache - ~/.cargo/git/db - target - key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - - name: Install cargo-release - run: cargo install cargo-release@0.25.6 - - - name: Setup user details - run: | - git config --global user.email "oscope-release-bot[bot]@users.noreply.github.com" - git config --global user.name "oscope-release-bot[bot]" - - - name: Calculate calver version - id: version - run: | - # Find existing tags for this month and determine next patch number - # Pattern: vYYYY.M.patch (cargo-release adds the 'v' prefix) - DATE="$(date +%Y.%-m)." - EXISTING_TAGS=$(git tag -l "v${DATE}*" | sort -t. -k3 -n | tail -1) - - if [ -z "$EXISTING_TAGS" ]; then - PATCH=1 - else - # Extract the patch number from the last tag (removing 'v' prefix) - LAST_PATCH=$(echo "$EXISTING_TAGS" | sed "s/v${DATE}//") - PATCH=$((LAST_PATCH + 1)) - fi - - NEW_VERSION="${DATE}${PATCH}" - echo "version=${NEW_VERSION}" >> "$GITHUB_OUTPUT" - echo "Calculated version: ${NEW_VERSION}" - - - name: Release latest version - run: cargo release --execute --no-confirm --no-verify --no-publish ${{ steps.version.outputs.version }} - env: - CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5a330fd..40ff488 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,315 +1,143 @@ -# This file was autogenerated by dist: https://axodotdev.github.io/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. -# Various formats will be parsed into a VERSION and an optional PACKAGE_NAME, where -# PACKAGE_NAME must be the name of a Cargo package in your workspace, and VERSION -# 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). -# -# If you push multiple tags at once, separate instances of this workflow will -# spin up, creating an independent announcement for each one. However, GitHub -# will hard limit this to 3 tags per commit, as it will assume more tags is a -# mistake. -# -# If there's a prerelease-style suffix to the version, then the release(s) -# will be marked as a prerelease. on: - pull_request: + workflow_dispatch: push: - tags: - - '**[0-9]+.[0-9]+.[0-9]+*' + branches: + - main jobs: - # Run 'dist plan' (or host) to determine what tasks we need to do - plan: - runs-on: "ubuntu-22.04" + prepare-release: + name: Prepare Release + runs-on: ubuntu-latest outputs: - val: ${{ steps.plan.outputs.manifest }} - tag: ${{ !github.event.pull_request && github.ref_name || '' }} - tag-flag: ${{ !github.event.pull_request && format('--tag={0}', github.ref_name) || '' }} - publishing: ${{ !github.event.pull_request }} - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + version: ${{ steps.version.outputs.version }} steps: - - uses: actions/checkout@v4 - with: - persist-credentials: false - 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.30.3/cargo-dist-installer.sh | sh" - - name: Cache dist - uses: actions/upload-artifact@v4 + - name: Checkout repository + uses: actions/checkout@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 + fetch-depth: 0 + + - name: Setup git user 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" - uses: actions/upload-artifact@v4 - with: - name: artifacts-plan-dist-manifest - path: plan-dist-manifest.json + git config --global user.email "github-actions[bot]@users.noreply.github.com" + git config --global user.name "github-actions[bot]" - # Build and packages all the platform-specific things - build-local-artifacts: - name: build-local-artifacts (${{ join(matrix.targets, ', ') }}) - # Let the initial task tell us to not run (currently very blunt) - needs: - - plan - 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 - steps: - - name: enable windows longpaths + - name: Calculate version + id: version run: | - git config --global core.longpaths true - - uses: actions/checkout@v4 - with: - persist-credentials: false - submodules: recursive - - name: Install Rust non-interactively if not already installed - if: ${{ matrix.container }} + VERSION=$(date -u +%Y.%m.%d.%H%M) + echo "version=${VERSION}" >> "$GITHUB_OUTPUT" + echo "Version: ${VERSION}" + + - name: Merge to release branch and tag 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 + set -euo pipefail + VERSION="${{ steps.version.outputs.version }}" + + # Checkout or create release branch + if git fetch origin release:release 2>/dev/null; then + git checkout release + else + git checkout -b release fi - - name: Install dist - run: ${{ matrix.install_dist.run }} - # Get the dist-manifest - - name: Fetch local artifacts - uses: actions/download-artifact@v4 - with: - pattern: artifacts-* - path: target/distrib/ - merge-multiple: true - - name: Install dependencies - run: | - ${{ matrix.packages_install }} - - 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 - # to "real" actions without writing to env-vars, and writing to env-vars has - # inconsistent syntax between shell and powershell. - shell: bash - run: | - # Parse out what we just built and upload it to scratch storage - echo "paths<> "$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" - - name: "Upload artifacts" - uses: actions/upload-artifact@v4 - with: - name: artifacts-build-local-${{ join(matrix.targets, '_') }} - path: | - ${{ steps.cargo-dist.outputs.paths }} - ${{ env.BUILD_MANIFEST_NAME }} + # Merge main into release (no commit yet) + git merge main --no-commit --no-ff - # Build and package all the platform-agnostic(ish) things - build-global-artifacts: - needs: - - plan - - build-local-artifacts - runs-on: "ubuntu-22.04" - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json - steps: - - uses: actions/checkout@v4 - with: - persist-credentials: false - 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" + # Update version in Cargo.toml + sed -i 's/^version = "0.0.0-dev"/version = "'"${VERSION}"'"/' Cargo.toml + grep -q "^version = \"${VERSION}\"" Cargo.toml || { echo "Version update failed"; exit 1; } - # Parse out what we just built and upload it to scratch storage - echo "paths<> "$GITHUB_OUTPUT" - jq --raw-output ".upload_files[]" dist-manifest.json >> "$GITHUB_OUTPUT" - echo "EOF" >> "$GITHUB_OUTPUT" + # Commit merge with version bump + git add Cargo.toml + git commit -m "Release v${VERSION}" - cp dist-manifest.json "$BUILD_MANIFEST_NAME" - - name: "Upload artifacts" - uses: actions/upload-artifact@v4 - with: - name: artifacts-build-global - path: | - ${{ steps.cargo-dist.outputs.paths }} - ${{ env.BUILD_MANIFEST_NAME }} + # Create tag + git tag "v${VERSION}" - custom-build-linux-pkgs: - needs: - - plan - - build-local-artifacts - uses: ./.github/workflows/build-linux-pkgs.yml - with: - plan: ${{ needs.plan.outputs.val }} - secrets: inherit - # Determines if we should publish/announce - host: - needs: - - plan - - build-local-artifacts - - build-global-artifacts - - custom-build-linux-pkgs - # Only run if we're "publishing", and only if plan, local and global didn't fail (skipped is fine) - if: ${{ always() && needs.plan.result == 'success' && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.custom-build-linux-pkgs.result == 'skipped' || needs.custom-build-linux-pkgs.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }} - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - runs-on: "ubuntu-22.04" - outputs: - val: ${{ steps.host.outputs.manifest }} + # Push release branch and tag + git push origin release --force-with-lease + git push origin "v${VERSION}" + + build: + name: Build ${{ matrix.target }} + needs: prepare-release + runs-on: ${{ matrix.runner }} + strategy: + fail-fast: false + matrix: + include: + - target: aarch64-apple-darwin + runner: macos-latest + use-cross: false + - target: x86_64-unknown-linux-gnu + runner: ubuntu-latest + use-cross: true + - target: x86_64-unknown-linux-musl + runner: ubuntu-latest + use-cross: true + - target: aarch64-unknown-linux-gnu + runner: ubuntu-latest + use-cross: true steps: - - uses: actions/checkout@v4 + - name: Checkout release branch + uses: actions/checkout@v4 with: - persist-credentials: false - 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 + ref: release + + - name: Install Rust + run: rustup update stable && rustup default stable + + - name: Install cross + if: matrix.use-cross + run: cargo install cross --git https://github.com/cross-rs/cross + + - name: Build with cross + if: matrix.use-cross + run: cross build --release --target ${{ matrix.target }} + + - name: Add Rust target + if: ${{ !matrix.use-cross }} + run: rustup target add ${{ matrix.target }} + + - name: Build with cargo + if: ${{ !matrix.use-cross }} + run: cargo build --release --target ${{ matrix.target }} + + - name: Create tarball 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" - - name: "Upload dist-manifest.json" + set -euo pipefail + mkdir -p dist + cp target/${{ matrix.target }}/release/scope dist/ + cp target/${{ matrix.target }}/release/scope-intercept dist/ + tar -czvf dev-scope-${{ matrix.target }}.tar.gz -C dist . + + - name: Upload artifact uses: actions/upload-artifact@v4 with: - # 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" + name: dev-scope-${{ matrix.target }} + path: dev-scope-${{ matrix.target }}.tar.gz + + release: + name: Create GitHub Release + needs: [prepare-release, build] + runs-on: ubuntu-latest + steps: + - name: Download all 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 + + - name: Create 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 }}" + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_REPO: ${{ github.repository }} 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 - - host - # use "always() && ..." to allow us to wait for all publish jobs while - # still allowing individual publish jobs to skip themselves (for prereleases). - # "host" however must run to completion, no skipping allowed! - if: ${{ always() && needs.host.result == 'success' }} - runs-on: "ubuntu-22.04" - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - steps: - - uses: actions/checkout@v4 - with: - persist-credentials: false - submodules: recursive - - custom-dotslash: - needs: - - plan - - announce - uses: ./.github/workflows/dotslash.yml - with: - plan: ${{ needs.plan.outputs.val }} - secrets: inherit + set -euo pipefail + VERSION="${{ needs.prepare-release.outputs.version }}" + gh release create "v${VERSION}" \ + --title "v${VERSION}" \ + --notes "" \ + artifacts/*.tar.gz diff --git a/Cargo.lock b/Cargo.lock index 6a3b5a2..ae12841 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -718,7 +718,7 @@ checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00" [[package]] name = "dev-scope" -version = "2026.1.12" +version = "0.0.0-dev" dependencies = [ "anyhow", "assert_cmd", diff --git a/Cargo.toml b/Cargo.toml index ff09d4a..753c3fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dev-scope" -version = "2026.1.12" +version = "0.0.0-dev" edition = "2024" default-run = "scope" repository = "https://github.com/oscope-dev/scope" @@ -13,12 +13,6 @@ documentation = "https://oscope-dev.github.io/scope/" readme = "README.md" publish = true -[package.metadata.dist] -dist = true - -[package.metadata.release] -tag-prefix = "" - [[bin]] name = "scope" @@ -92,8 +86,3 @@ tempfile = "3.0" [build-dependencies] anyhow = "1.0.90" vergen = { version = "8.3", features = ["build", "git", "git2"] } - -# The profile that 'cargo dist' will build with -[profile.dist] -inherits = "release" -lto = "thin" diff --git a/dist-workspace.toml b/dist-workspace.toml deleted file mode 100644 index e737b26..0000000 --- a/dist-workspace.toml +++ /dev/null @@ -1,25 +0,0 @@ -[workspace] -members = ["cargo:."] - -# Config for 'dist' -[dist] -# The preferred dist version to use in CI (Cargo.toml SemVer syntax) -cargo-dist-version = "0.30.3" -# 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", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl"] -# Global artifacts jobs to run in CI -global-artifacts-jobs = ["./build-linux-pkgs"] -# Which actions to run on pull requests -pr-run-mode = "plan" -# Whether to publish prereleases to package managers -publish-prereleases = true -# Post-announce jobs to run in CI -post-announce-jobs = ["./dotslash"] -# Path that installers should place binaries in -install-path = "CARGO_HOME" -# Whether to install an updater program -install-updater = false