Skip to content

Commit 7b658ee

Browse files
committed
fix: lowercase Docker tags and fix artifact extraction
1 parent 85e2f9b commit 7b658ee

1 file changed

Lines changed: 14 additions & 7 deletions

File tree

.github/workflows/release.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,12 @@ jobs:
189189
- name: Create checksums
190190
run: |
191191
cd artifacts
192-
find . -type f \( -name "*.tar.gz" -o -name "*.zip" \) -exec mv {} . \;
193-
sha256sum *.tar.gz *.zip > SHA256SUMS.txt
192+
# Move files from subdirectories to current directory
193+
find . -mindepth 2 -type f \( -name "*.tar.gz" -o -name "*.zip" \) -exec mv {} . \;
194+
# Remove empty directories
195+
find . -type d -empty -delete
196+
# Create checksums
197+
sha256sum *.tar.gz *.zip 2>/dev/null > SHA256SUMS.txt || true
194198
cat SHA256SUMS.txt
195199
196200
- name: Create GitHub Release
@@ -218,11 +222,14 @@ jobs:
218222
- name: Checkout repository
219223
uses: actions/checkout@v4
220224

221-
- name: Get version
225+
- name: Get version and repo info
222226
id: version
223227
run: |
224228
VERSION="${GITHUB_REF#refs/tags/}"
225229
echo "version=$VERSION" >> $GITHUB_OUTPUT
230+
# Lowercase the repository owner for Docker tags
231+
REPO_OWNER=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
232+
echo "repo_owner=$REPO_OWNER" >> $GITHUB_OUTPUT
226233
227234
- name: Download Linux x86_64 artifact
228235
uses: actions/download-artifact@v4
@@ -263,8 +270,8 @@ jobs:
263270
platforms: linux/amd64,linux/arm64
264271
push: true
265272
tags: |
266-
ghcr.io/${{ github.repository }}/tun-server:${{ steps.version.outputs.version }}
267-
ghcr.io/${{ github.repository }}/tun-server:latest
273+
ghcr.io/${{ steps.version.outputs.repo_owner }}/tun-server:${{ steps.version.outputs.version }}
274+
ghcr.io/${{ steps.version.outputs.repo_owner }}/tun-server:latest
268275
269276
- name: Build and push client image
270277
uses: docker/build-push-action@v5
@@ -274,6 +281,6 @@ jobs:
274281
platforms: linux/amd64,linux/arm64
275282
push: true
276283
tags: |
277-
ghcr.io/${{ github.repository }}/tun-client:${{ steps.version.outputs.version }}
278-
ghcr.io/${{ github.repository }}/tun-client:latest
284+
ghcr.io/${{ steps.version.outputs.repo_owner }}/tun-client:${{ steps.version.outputs.version }}
285+
ghcr.io/${{ steps.version.outputs.repo_owner }}/tun-client:latest
279286

0 commit comments

Comments
 (0)