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

Jump to bottom

Fix release builds #218

Merged
merged 2 commits into from
Dec 1, 2022
Merged

Fix release builds #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ebac25
Install asciidoctor into system ruby
swsnr Dec 1, 2022
cf94192
Simplify package script
swsnr Dec 1, 2022
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
6 changes: 2 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@ jobs:
- uses: dtolnay/rust-toolchain@stable
with:
targets: ${{ matrix.target }}
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3
- run: gem install asciidoctor
- run: sudo gem install asciidoctor
if: "!contains(matrix.target, 'windows')"
- run: sudo apt-get install musl-tools
if: contains(matrix.target, 'linux-musl')
- shell: bash
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3
- run: gem install asciidoctor
- run: sudo gem install asciidoctor
- run: asciidoctor -b manpage -a reproducible mdcat.1.adoc

cargo-deny:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ To publish a new release run `scripts/release` from the project directory.

## [Unreleased]

### Fixed
- Fix release workflow to restore release artifacts (see [GH-218]).

[GH-218]: https://github.com/swsnr/mdcat/pull/218

## [0.30.2] – 2022-12-01

### Changed
Expand Down
13 changes: 9 additions & 4 deletions scripts/package
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ package_windows() {
local archive_file
archive_file="${ARCHIVE_NAME}.zip"
mv LICENSE LICENSE.txt
7z a "${archive_file}" "./target/${TARGET}/release/mdcat.exe" ./README.md ./CHANGELOG.md ./LICENSE.txt "${OUTDIR}/completions" ./mdcat.1.adoc
7z a "${archive_file}" \
"./target/${TARGET}/release/mdcat.exe" \
./README.md ./CHANGELOG.md ./LICENSE.txt ./mdcat.1.adoc \
"${OUTDIR}/completions"
if [[ -n "${GITHUB_OUTPUT:-}" ]]; then
echo "file=${archive_file}" >>"${GITHUB_OUTPUT}"
echo "name=${ARCHIVE_NAME}.zip" >>"${GITHUB_OUTPUT}"
Expand All @@ -32,9 +35,11 @@ package_unix() {
pkg_dir=$(mktemp -d)

mkdir "${pkg_dir}/${ARCHIVE_NAME}"
cp README.md CHANGELOG.md LICENSE "target/${TARGET}/release/mdcat" "${pkg_dir}/${ARCHIVE_NAME}"
cp -r "${OUTDIR}/completions" "${pkg_dir}/${ARCHIVE_NAME}"
cp "${OUTDIR}/mdcat.1" "${pkg_dir}/${ARCHIVE_NAME}"
cp -r \
README.md CHANGELOG.md LICENSE \
"target/${TARGET}/release/mdcat" \
"${OUTDIR}/mdcat.1" "${OUTDIR}/completions" \
"${pkg_dir}/${ARCHIVE_NAME}"
tar -czf "${PWD}/${archive_file}" -C "${pkg_dir}" "${ARCHIVE_NAME}"
echo "file=${archive_file}" >>"${GITHUB_OUTPUT}"
echo "name=${ARCHIVE_NAME}.tar.gz" >>"${GITHUB_OUTPUT}"
Expand Down