Skip to content
This repository was archived by the owner on Jul 4, 2025. It is now read-only.

Commit 38647e3

Browse files
hiro-vhiro-v
committed
fix(ci): Update tag name and unified steps
1 parent d0957da commit 38647e3

File tree

1 file changed

+59
-93
lines changed

1 file changed

+59
-93
lines changed

‎.github/workflows/build.yml‎

Lines changed: 59 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -46,39 +46,30 @@ jobs:
4646
CC=gcc-8 make -j $(nproc)
4747
ls -la
4848
49-
- name: Determine tag name
50-
id: tag
49+
- name: Extract branch name
5150
shell: bash
52-
run: |
53-
BUILD_NUMBER="$(git rev-list --count HEAD)"
54-
SHORT_HASH="$(git rev-parse --short=7 HEAD)"
55-
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
56-
echo "name=b${BUILD_NUMBER}" >> $GITHUB_OUTPUT
57-
else
58-
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
59-
echo "name=${SAFE_NAME}-b${BUILD_NUMBER}-${SHORT_HASH}" >> $GITHUB_OUTPUT
60-
fi
51+
id: extract_branch
52+
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
53+
- name: Extract commit short SHA
54+
id: extract_commit_id
55+
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
6156

6257
- name: Package
6358
shell: bash
6459
run: |
65-
mkdir -p build/nitro-${{ steps.tag.outputs.name }}-linux-amd64
66-
mkdir -p build/nitro-${{ steps.tag.outputs.name }}-linux-amd64/config
67-
cp config.json build/nitro-${{ steps.tag.outputs.name }}-linux-amd64/config
68-
cp build/nitro build/nitro-${{ steps.tag.outputs.name }}-linux-amd64
69-
cd build
70-
zip -r nitro-${{ steps.tag.outputs.name }}-linux-amd64.zip nitro-${{ steps.tag.outputs.name }}-linux-amd64
71-
ls -la
72-
cd ..
60+
mkdir -p nitro && mkdir -p nitro/config
61+
cp config.json nitro/config/
62+
cp build/nitro nitro/
63+
zip -r nitro.zip nitro
7364
7465
- name: Upload binaries to release
75-
if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
66+
# if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
7667
uses: svenstaro/upload-release-action@v2
7768
with:
7869
repo_token: ${{ secrets.GITHUB_TOKEN }}
79-
file: build/nitro-${{ steps.tag.outputs.name }}-linux-amd64.zip
80-
asset_name: nitro-${{ steps.tag.outputs.name }}-linux-amd64.zip
81-
tag: ${{ steps.tag.outputs.name }}
70+
file: nitro.zip
71+
asset_name: nitro-${{ steps.extract_commit_id.outputs.sha_short }}-linux-amd64.zip
72+
tag: ${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_commit_id.outputs.sha_short }}
8273

8374
ubuntu-amd64-cuda-build:
8475
runs-on: linux-gpu
@@ -106,39 +97,31 @@ jobs:
10697
CC=gcc-8 make -j $(nproc)
10798
ls -la
10899
109-
- name: Determine tag name
110-
id: tag
100+
- name: Extract branch name
111101
shell: bash
112-
run: |
113-
BUILD_NUMBER="$(git rev-list --count HEAD)"
114-
SHORT_HASH="$(git rev-parse --short=7 HEAD)"
115-
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
116-
echo "name=b${BUILD_NUMBER}" >> $GITHUB_OUTPUT
117-
else
118-
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
119-
echo "name=${SAFE_NAME}-b${BUILD_NUMBER}-${SHORT_HASH}" >> $GITHUB_OUTPUT
120-
fi
102+
id: extract_branch
103+
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
104+
105+
- name: Extract commit short SHA
106+
id: extract_commit_id
107+
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
121108

122109
- name: Package
123110
shell: bash
124111
run: |
125-
mkdir -p build/nitro-${{ steps.tag.outputs.name }}-linux-amd64-cuda
126-
mkdir -p build/nitro-${{ steps.tag.outputs.name }}-linux-amd64-cuda/config
127-
cp config.json build/nitro-${{ steps.tag.outputs.name }}-linux-amd64-cuda/config
128-
cp build/nitro build/nitro-${{ steps.tag.outputs.name }}-linux-amd64-cuda
129-
cd build
130-
zip -r nitro-${{ steps.tag.outputs.name }}-linux-amd64-cuda.zip nitro-${{ steps.tag.outputs.name }}-linux-amd64-cuda
131-
ls -la
132-
cd ..
112+
mkdir -p nitro && mkdir -p nitro/config
113+
cp config.json nitro/config/
114+
cp build/nitro nitro/
115+
zip -r nitro.zip nitro
133116
134117
- name: Upload binaries to release
135118
# if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
136119
uses: svenstaro/upload-release-action@v2
137120
with:
138121
repo_token: ${{ secrets.GITHUB_TOKEN }}
139-
file: build/nitro-${{ steps.tag.outputs.name }}-linux-amd64-cuda.zip
140-
asset_name: nitro-${{ steps.tag.outputs.name }}-linux-amd64-cuda.zip
141-
tag: ${{ steps.tag.outputs.name }}
122+
file: nitro.zip
123+
asset_name: nitro-${{ steps.extract_commit_id.outputs.sha_short }}-linux-amd64-cuda.zip
124+
tag: ${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_commit_id.outputs.sha_short }}
142125

143126
macOS-M-build:
144127
runs-on: mac-silicon
@@ -167,40 +150,32 @@ jobs:
167150
CC=gcc-8 make -j $(nproc)
168151
ls -la
169152
170-
- name: Determine tag name
171-
id: tag
153+
- name: Extract branch name
172154
shell: bash
173-
run: |
174-
BUILD_NUMBER="$(git rev-list --count HEAD)"
175-
SHORT_HASH="$(git rev-parse --short=7 HEAD)"
176-
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
177-
echo "name=b${BUILD_NUMBER}" >> $GITHUB_OUTPUT
178-
else
179-
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
180-
echo "name=${SAFE_NAME}-b${BUILD_NUMBER}-${SHORT_HASH}" >> $GITHUB_OUTPUT
181-
fi
182-
155+
id: extract_branch
156+
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
157+
158+
- name: Extract commit short SHA
159+
id: extract_commit_id
160+
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
161+
183162
- name: Package
184163
shell: bash
185164
run: |
186-
mkdir -p build/nitro-${{ steps.tag.outputs.name }}-mac-arm64
187-
mkdir -p build/nitro-${{ steps.tag.outputs.name }}-mac-arm64/config
188-
cp config.json build/nitro-${{ steps.tag.outputs.name }}-mac-arm64/config
189-
cp llama.cpp/ggml-metal.h build/nitro-${{ steps.tag.outputs.name }}-mac-arm64
190-
cp build/nitro build/nitro-${{ steps.tag.outputs.name }}-mac-arm64
191-
cd build
192-
zip -r nitro-${{ steps.tag.outputs.name }}-mac-arm64.zip nitro-${{ steps.tag.outputs.name }}-mac-arm64
193-
ls -la
194-
cd ..
165+
mkdir -p nitro && mkdir -p nitro/config
166+
cp config.json nitro/config/
167+
cp llama.cpp/ggml-metal.h nitro/
168+
cp build/nitro nitro/
169+
zip -r nitro.zip nitro
195170
196171
- name: Upload binaries to release
197172
# if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
198173
uses: svenstaro/upload-release-action@v2
199174
with:
200175
repo_token: ${{ secrets.GITHUB_TOKEN }}
201-
file: build/nitro-${{ steps.tag.outputs.name }}-mac-arm64.zip
202-
asset_name: nitro-${{ steps.tag.outputs.name }}-mac-arm64.zip
203-
tag: ${{ steps.tag.outputs.name }}
176+
file: nitro.zip
177+
asset_name: nitro-${{ steps.extract_commit_id.outputs.sha_short }}-mac-arm64.zip
178+
tag: ${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_commit_id.outputs.sha_short }}
204179

205180
macOS-Intel-build:
206181
runs-on: macos-latest
@@ -228,37 +203,28 @@ jobs:
228203
CC=gcc-8 make -j $(nproc)
229204
ls -la
230205
231-
- name: Determine tag name
232-
id: tag
206+
- name: Extract branch name
233207
shell: bash
234-
run: |
235-
BUILD_NUMBER="$(git rev-list --count HEAD)"
236-
SHORT_HASH="$(git rev-parse --short=7 HEAD)"
237-
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
238-
echo "name=b${BUILD_NUMBER}" >> $GITHUB_OUTPUT
239-
else
240-
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
241-
echo "name=${SAFE_NAME}-b${BUILD_NUMBER}-${SHORT_HASH}" >> $GITHUB_OUTPUT
242-
fi
243-
208+
id: extract_branch
209+
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
210+
211+
- name: Extract commit short SHA
212+
id: extract_commit_id
213+
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
214+
244215
- name: Package
245216
shell: bash
246217
run: |
247-
mkdir -p build/nitro-${{ steps.tag.outputs.name }}-mac-amd64
248-
mkdir -p build/nitro-${{ steps.tag.outputs.name }}-mac-amd64/config
249-
cp config.json build/nitro-${{ steps.tag.outputs.name }}-mac-amd64/config
250-
cp llama.cpp/ggml-metal.h build/nitro-${{ steps.tag.outputs.name }}-mac-amd64
251-
cp build/nitro build/nitro-${{ steps.tag.outputs.name }}-mac-amd64
252-
cd build
253-
zip -r nitro-${{ steps.tag.outputs.name }}-mac-amd64.zip nitro-${{ steps.tag.outputs.name }}-mac-amd64
254-
ls -la
255-
cd ..
218+
mkdir -p nitro && mkdir -p nitro/config
219+
cp config.json nitro/config/
220+
cp build/nitro nitro/
221+
zip -r nitro.zip nitro
256222
257223
- name: Upload binaries to release
258224
# if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
259225
uses: svenstaro/upload-release-action@v2
260226
with:
261227
repo_token: ${{ secrets.GITHUB_TOKEN }}
262-
file: build/nitro-${{ steps.tag.outputs.name }}-mac-amd64.zip
263-
asset_name: nitro-${{ steps.tag.outputs.name }}-mac-amd64.zip.zip
264-
tag: ${{ steps.tag.outputs.name }}
228+
file: build/nitro-${{ steps.extract_commit_id.outputs.sha_short }}-mac-amd64.zip
229+
asset_name: nitro-${{ steps.extract_commit_id.outputs.sha_short }}-mac-amd64.zip.zip
230+
tag: ${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_commit_id.outputs.sha_short }}

0 commit comments

Comments
 (0)