Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #30

Merged
merged 2 commits into from
Jul 9, 2024
Merged

Dev #30

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
# title/body based on your changelogs.

name: Release

permissions:
contents: write
"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.
Expand Down Expand Up @@ -62,7 +61,7 @@ jobs:
# 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.17.0/cargo-dist-installer.sh | sh"
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.18.0/cargo-dist-installer.sh | sh"
- name: Cache cargo-dist
uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -116,10 +115,6 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: swatinem/rust-cache@v2
with:
key: ${{ join(matrix.targets, '-') }}
cache-provider: ${{ matrix.cache_provider }}
- name: Install cargo-dist
run: ${{ matrix.install_dist }}
# Get the dist-manifest
Expand Down
10 changes: 6 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "piscem"
version = "0.10.0"
version = "0.10.1"
edition = "2021"
build = "build.rs"
repository = "https://github.com/COMBINE-lab/piscem"
Expand Down Expand Up @@ -29,7 +29,7 @@ inherits = "release"
# Config for 'cargo dist'
[workspace.metadata.dist]
# The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)
cargo-dist-version = "0.17.0"
cargo-dist-version = "0.18.0"
# The installers to generate for each app
installers = ["shell"]
# Target platforms to build apps for (Rust target-triple syntax)
Expand All @@ -42,6 +42,8 @@ ci = "github"
pr-run-mode = "plan"
# Whether to install an updater program
install-updater = true
# Generate and dist a source tarball
source-tarball = false
## since this is cross-language and
## we are not including C++ debug
## symbols, this currently doesn't work
Expand All @@ -50,8 +52,8 @@ install-updater = true
# split-debuginfo = "packed"

[[workspace.metadata.dist.extra-artifacts]]
artifacts = ["source_recursive.tar.gz"]
build = ["bash", "scripts/git-archive-all.sh", "--format", "tar.gz", "--prefix", "piscem/", "source_recursive.tar.gz"]
artifacts = ["source.tar.gz", "source.tar.gz.sha256"]
build = ["bash", "scripts/git-archive-all.sh", "--format", "tar.gz", "--prefix", "piscem/", "source.tar.gz"]

[workspace.metadata.dist.github-custom-runners]
aarch64-apple-darwin = "macos-14"
Expand Down
6 changes: 6 additions & 0 deletions scripts/git-archive-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -352,3 +352,9 @@ done < $TMPFILE
if [ $VERBOSE -eq 1 ]; then
echo "done"
fi

if [ $VERBOSE -eq 1 ]; then
echo "computing sha256 of the tarball"
fi
shasum -a 256 ${OUT_FILE} > ${OUT_FILE}.sha256