Skip to content

Commit 4bc0449

Browse files
committed
CI fixes
1 parent 5e6bc9d commit 4bc0449

2 files changed

Lines changed: 18 additions & 9 deletions

File tree

.github/workflows/binary-builds.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -142,41 +142,49 @@ jobs:
142142
if: runner.os != 'Windows'
143143
shell: bash
144144
run: |-
145+
mkdir dist
146+
cp LICENSE dist/LICENSE
147+
cd dist
148+
145149
tgt="cpp-linter"
146-
mv "target/${{ matrix.target }}/release/${tgt}" "${tgt}"
150+
mv "../target/${{ matrix.target }}/release/${tgt}" "./${tgt}"
147151
arc_name="${tgt}-${{ matrix.target }}.tar.gz"
148152
tar -a -c -v -z -f "${arc_name}" ${tgt} LICENSE
149153
150154
tgt="clang-tools"
151-
mv "target/${{ matrix.target }}/release/${tgt}" "${tgt}"
155+
mv "../target/${{ matrix.target }}/release/${tgt}" "./${tgt}"
152156
arc_name="${tgt}-${{ matrix.target }}.tar.gz"
153-
tar -a -c -v -z -f "${arc_name}" ${tgt} LICENSE
157+
tar -a -c -v -z -f ${tgt} -f LICENSE "${arc_name}"
154158
- name: Prepare artifacts (windows)
155159
if: runner.os == 'Windows'
156160
shell: pwsh
157161
# `tar.exe` in powershell is different from `tar` in bash.
158162
# need to use `tar.exe` in powershell to create a valid zip file.
159163
run: |-
164+
mkdir dist
165+
Copy-Item ./LICENSE ./dist/LICENSE
166+
cd dist
167+
160168
$tgt = "cpp-linter"
161-
mv "target/${{ matrix.target }}/release/${tgt}.exe" "${tgt}.exe"
169+
mv "../target/${{ matrix.target }}/release/${tgt}.exe" "./${tgt}.exe"
162170
$arc_name = "${tgt}-${{ matrix.target }}.zip"
163-
tar -a -c -v -f "${arc_name}" ${tgt} LICENSE
171+
tar -a -c -v -f ${tgt}.exe -f LICENSE "@${arc_name}"
164172
165173
$tgt = "clang-tools"
166-
mv "target/${{ matrix.target }}/release/${tgt}.exe" "${tgt}.exe"
174+
mv "../target/${{ matrix.target }}/release/${tgt}.exe" "./${tgt}.exe"
167175
$arc_name = "${tgt}-${{ matrix.target }}.zip"
168-
tar -a -c -v -f "${arc_name}" ${tgt} LICENSE
176+
tar -a -c -v -f ${tgt}.exe -f LICENSE "@${arc_name}"
169177
- name: Upload cpp-linter artifacts
170178
uses: actions/upload-artifact@v7
171179
with:
172180
name: cpp-linter-${{ matrix.target }}
173-
path: cpp-linter-${{ matrix.target }}*
181+
path: dist/cpp-linter-${{ matrix.target }}*
174182
if-no-files-found: error
175183
- name: Upload clang-tools artifacts
176184
uses: actions/upload-artifact@v7
177185
with:
178186
name: clang-tools-${{ matrix.target }}
179-
path: clang-tools-${{ matrix.target }}*
187+
path: dist/clang-tools-${{ matrix.target }}*
180188
if-no-files-found: error
181189

182190
publish:

.github/workflows/bump-n-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ jobs:
8787
id: get-pkgs
8888
shell: nu {0}
8989
run: |-
90+
print (pwd)
9091
cd ${{ github.workspace }}
9192
use ${{ github.workspace }}/.github/workflows/bump-n-release.nu get-changed-pkgs
9293
let pkgs = get-changed-pkgs

0 commit comments

Comments
 (0)