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.

Sign up for GitHub

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

ci: follow .deb naming conventions #969

Merged
merged 15 commits into from
Jan 12, 2023
Merged

ci: follow .deb naming conventions #969

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
85b1099
ci: follow .deb naming conventions
ClementTsang Jan 12, 2023
5af3dc3
use awk to grab the version
ClementTsang Jan 12, 2023
7cc396b
fix if check
ClementTsang Jan 12, 2023
241f019
fix version grabber directory
ClementTsang Jan 12, 2023
a6a2643
fix version passing
ClementTsang Jan 12, 2023
80a64ab
Test simulating release version
ClementTsang Jan 12, 2023
e1f2aa2
fix issue with typo
ClementTsang Jan 12, 2023
0bf3ab8
revert
ClementTsang Jan 12, 2023
0dd019e
attempt fix to properly name generated files
ClementTsang Jan 12, 2023
6c729d0
fix version for non-x86
ClementTsang Jan 12, 2023
0ce8439
show 8 parts of sha for consistency
ClementTsang Jan 12, 2023
d92b418
make git hash in build script 8 for consistency
ClementTsang Jan 12, 2023
7a3758e
use GH env var if available
ClementTsang Jan 12, 2023
8c657f4
fix links
ClementTsang Jan 12, 2023
5e401a6
trim quotes
ClementTsang Jan 12, 2023
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
Prev Previous commit
Next Next commit
fix version for non-x86
  • Loading branch information
@ClementTsang
ClementTsang committed Jan 12, 2023
commit 6c729d0b04f809ce87710e02cba6b36e9c4e0cc8
11 changes: 9 additions & 2 deletions .github/workflows/build_releases.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,8 +364,15 @@ jobs:
if: ${{ inputs.caller == 'nightly' }}
id: custom-version
run: |
VERSION=$(./target/${{ matrix.info.target }}/release/btm -V | awk '{print $2}')
echo "CUSTOM_VERSION_ARG='--deb-version=$VERSION'" >> $GITHUB_OUTPUT
if [[ ${{ matrix.info.cross }} == false ]]; then
# x86-64 can be directly executed, so we can do the easy way out.
VERSION=$(./target/${{ matrix.info.target }}/release/btm -V | awk '{print $2}')
echo "CUSTOM_VERSION_ARG='--deb-version=$VERSION'" >> $GITHUB_OUTPUT
else
VER=$(grep -m1 "^version" Cargo.toml | awk '{print $3}' | tr -d \")
APPEND=nightly-${GITHUB_SHA::7}
echo "CUSTOM_VERSION_ARG='--deb-version=$VER-$APPEND'" >> $GITHUB_OUTPUT
fi

- name: Build Debian release (x86-64)
if: matrix.info.cross == false
Expand Down
5 changes: 3 additions & 2 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,12 @@ fn nightly_version() {
{
println!("cargo:rustc-env=NIGHTLY_VERSION={version}-nightly-{git_hash}");
} else if let Ok(output) = std::process::Command::new("git")
.args(["rev-parse", "--short", "HEAD"])
.args(["rev-parse", "HEAD"])
.output()
{
let git_hash = String::from_utf8(output.stdout).unwrap();
println!("cargo:rustc-env=NIGHTLY_VERSION={version}-nightly-{git_hash}");
let short_hash = git_hash.get(0..8).unwrap();
println!("cargo:rustc-env=NIGHTLY_VERSION={version}-nightly-{short_hash}");
}
}
_ => {}
Expand Down