Skip to content

Commit a5b4795

Browse files
Simplify packaging WIP #31
1 parent ca44613 commit a5b4795

File tree

2 files changed

+14
-20
lines changed

2 files changed

+14
-20
lines changed

.github/workflows/release.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ jobs:
104104
if: ${{ matrix.os == 'windows-latest' }}
105105
uses: actions/upload-artifact@v4
106106
with:
107-
name: "rabbitmqadmin-${{ vars.NEXT_RELESE_VERSION }}-${{ matrix.target }}.zip"
108-
path: "${{ github.workspace }}/target/${{ matrix.target }}/release/rabbitmqadmin-${{ vars.NEXT_RELESE_VERSION }}-${{ matrix.target }}.zip"
107+
name: "rabbitmqadmin-${{ vars.NEXT_RELESE_VERSION }}-${{ matrix.target }}.exe"
108+
path: "${{ github.workspace }}/target/${{ matrix.target }}/release/rabbitmqadmin-${{ vars.NEXT_RELESE_VERSION }}-${{ matrix.target }}.exe"
109109
retention-days: 2
110110

111111
create_gh_release:
@@ -125,7 +125,7 @@ jobs:
125125
- name: Fetch Windows archive
126126
uses: actions/download-artifact@v4
127127
with:
128-
name: "rabbitmqadmin-${{ vars.NEXT_RELESE_VERSION }}-x86_64-pc-windows-gnu.zip"
128+
name: "rabbitmqadmin-${{ vars.NEXT_RELESE_VERSION }}-x86_64-pc-windows-gnu.exe"
129129
path: ./artifacts
130130
- name: Publish rabbitmqadmin release archive
131131
uses: softprops/action-gh-release@v2

scripts/release-windows.nu

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ rm -rf $release_dir
2020
mkdir $release_dir
2121

2222
print $'Building on Windows in ($src)...'
23-
cargo rustc --bin $binary --target $target --release
23+
cargo rustc -q --bin $binary --target $target --release
2424

2525
#
2626
# Release packaging
@@ -35,22 +35,16 @@ cp -r LICENSE* $release_dir
3535
cp -r README* $release_dir
3636

3737
cd $release_dir
38-
ls $release_dir
39-
40-
let archive_filename = $'($binary)-($version)-($target).zip'
41-
print $'Release archive name: ($archive_filename)'
42-
7z a $archive_filename $binary_filename
43-
44-
print $'(char nl)(ansi g)Archive contents:(ansi reset)'; hr-line; ls | print
45-
let archive = $'($release_dir)/($archive_filename).zip'
46-
7z a $archive ...(glob *)
47-
let pkg = (ls -f $archive | get name)
48-
if not ($pkg | is-empty) {
49-
# Workaround for https://github.com/softprops/action-gh-release/issues/280
50-
let archive = ($pkg | get 0 | str replace --all '\' '/')
51-
print $'Zip archive path: ($archive)'
52-
echo $"archive=($archive)" | save --append $env.GITHUB_OUTPUT
53-
}
38+
39+
let artifact_filename = $'($binary)-($version)-($target).exe'
40+
41+
print $'(char nl)(ansi g)Build artifacts:(ansi reset)'; hr-line; ls | print
42+
print $'Release artifact name: ($artifact_filename)'
43+
44+
cp $binary_filename $artifact_filename
45+
46+
print $'Artifact ($artifact_filename) is ready'
47+
echo $'artifact=($artifact_filename)' | save --append $env.GITHUB_OUTPUT
5448

5549

5650
# Print a horizontal line marker

0 commit comments

Comments
 (0)