apps/frp-panel
1
0
Fork 0
mirror of https://github.com/VaalaCat/frp-panel.git synced 2026-04-22 23:17:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: build version tag

Browse Source
This commit is contained in:
VaalaCat
2026-01-02 14:36:31 +00:00
parent c09ff8cc00
commit e53425b481
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/tag.workflow.yml
+2 -5
View File
@@ -8,9 +8,6 @@ jobs:
build-static: build-static:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Get version
id: get_version
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
@@ -40,7 +37,7 @@ jobs:
with: with:
repo_token: "${{ secrets.GITHUB_TOKEN }}" repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: false prerelease: false
automatic_release_tag: ${{ steps.get_version.outputs.VERSION }} automatic_release_tag: ${{ github.ref_name }}
files: | files: |
dist/* dist/*
- name: Latest Release - name: Latest Release
@@ -61,5 +58,5 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
run: | run: |
echo "${password}" | ko login docker.io --username ${username} --password-stdin echo "${password}" | ko login docker.io --username ${username} --password-stdin
ko build ./cmd/frpp --sbom=none --bare -t ${{ steps.get_version.outputs.VERSION }} ko build ./cmd/frpp --sbom=none --bare -t ${{ github.ref_name }}
ko build ./cmd/frpp --sbom=none --bare -t latest ko build ./cmd/frpp --sbom=none --bare -t latest
.github/workflows/workerd-docker-tag.workflow.yml
+1 -4
View File
@@ -8,9 +8,6 @@ jobs:
build-static: build-static:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Get version
id: get_version
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
@@ -46,5 +43,5 @@ jobs:
run: | run: |
mv .ko.workerd.yaml .ko.yaml mv .ko.workerd.yaml .ko.yaml
echo "${password}" | ko login docker.io --username ${username} --password-stdin echo "${password}" | ko login docker.io --username ${username} --password-stdin
ko build ./cmd/frpp --sbom=none --bare -t ${{ steps.get_version.outputs.VERSION }}-workerd ko build ./cmd/frpp --sbom=none --bare -t ${{ github.ref_name }}-workerd
ko build ./cmd/frpp --sbom=none --bare -t latest-workerd ko build ./cmd/frpp --sbom=none --bare -t latest-workerd
build.sh
+4
View File
@@ -21,6 +21,10 @@ GIT_COMMIT="$(git rev-parse HEAD)"
VERSION="$(git describe --tags --abbrev=0 | tr -d '\n')" VERSION="$(git describe --tags --abbrev=0 | tr -d '\n')"
GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)" GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
if [[ -n "$GITHUB_REF_NAME" ]]; then
VERSION="$GITHUB_REF_NAME"
fi
# Parse arguments # Parse arguments
while [[ "$#" -gt 0 ]]; do while [[ "$#" -gt 0 ]]; do
case $1 in case $1 in