LiteyukiStudio/liteyuki-runner
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复仓库匹配逻辑，添加大小写不敏感的比较
Some checks failed
checks / check and test (push) Successful in 10m38s
Details
release-nightly / release-image (push) Failing after 20m24s
Details

Browse Source
This commit is contained in:
远野千束 2025-04-13 22:50:38 +08:00
parent eceef92735
commit f3622b3d44
2 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
.gitea/workflows/release-nightly.yml
View File

@ -1,76 +1,76 @@
name: release-nightly name: release-nightly
on: on:
push: push:
branches: [main] branches: [main]
tags: tags:
- "*" - "*"
jobs: jobs:
release-image: release-image:
runs-on: ubuntu-latest runs-on: liteyukios-latest
container: container:
image: catthehacker/ubuntu:act-latest image: catthehacker/ubuntu:act-latest
env: env:
DOCKER_ORG: gitea DOCKER_ORG: gitea
DOCKER_LATEST: nightly DOCKER_LATEST: nightly
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
fetch-depth: 0 # all history for all branches and tags fetch-depth: 0 # all history for all branches and tags
- name: Set up Docker BuildX - name: Set up Docker BuildX
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
- name: Login to Liteyuki Harbor - name: Login to Liteyuki Harbor
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: reg.liteyuki.icu registry: reg.liteyuki.icu
username: ${{ secrets.HARBOR_USERNAME }} username: ${{ secrets.HARBOR_USERNAME }}
password: ${{ secrets.HARBOR_PASSWORD }} password: ${{ secrets.HARBOR_PASSWORD }}
- name: Get Meta - name: Get Meta
id: meta id: meta
run: | run: |
echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
echo REPO_VERSION=${GITHUB_REF_NAME#v} >> $GITHUB_OUTPUT echo REPO_VERSION=${GITHUB_REF_NAME#v} >> $GITHUB_OUTPUT
- name: Build and push - name: Build and push
uses: docker/build-push-action@v5 uses: docker/build-push-action@v5
with: with:
context: . context: .
file: ./Dockerfile file: ./Dockerfile
target: basic target: basic
platforms: | platforms: |
linux/amd64 linux/amd64
# linux/arm64 linux/arm64
push: true push: true
tags: | tags: |
reg.liteyuki.icu/comp/liteyuki-runner:latest reg.liteyuki.icu/comp/liteyuki-runner:latest
# - name: Build and push dind - name: Build and push dind
# uses: docker/build-push-action@v5 uses: docker/build-push-action@v5
# with: with:
# context: . context: .
# file: ./Dockerfile file: ./Dockerfile
# target: dind target: dind
# platforms: | platforms: |
# linux/amd64 linux/amd64
## linux/arm64 linux/arm64
# push: true push: true
# tags: | tags: |
# reg.liteyuki.icu/comp/liteyuki-runner:latest-dind reg.liteyuki.icu/comp/liteyuki-runner:latest-dind
#
# - name: Build and push dind-rootless - name: Build and push dind-rootless
# uses: docker/build-push-action@v5 uses: docker/build-push-action@v5
# with: with:
# context: . context: .
# file: ./Dockerfile file: ./Dockerfile
# target: dind-rootless target: dind-rootless
# platforms: | platforms: |
# linux/amd64 linux/amd64
## linux/arm64 linux/arm64
# push: true push: true
# tags: | tags: |
# reg.liteyuki.icu/comp/liteyuki-runner:latest-dind-rootless reg.liteyuki.icu/comp/liteyuki-runner:latest-dind-rootless

4
internal/app/run/runner.go
View File

@ -267,8 +267,8 @@ func matchAllowedRepo(targetRepo string, allowedRepos []string) bool {
continue continue
} }
allowedOwner, allowedRepoName := parts[0], parts[1] allowedOwner, allowedRepoName := parts[0], parts[1]
if (allowedOwner == "*" || allowedOwner == targetOwner) && if (allowedOwner == "*" || strings.ToLower(allowedOwner) == strings.ToLower(targetOwner)) &&
(allowedRepoName == "*" || allowedRepoName == targetRepoName) { (allowedRepoName == "*" || strings.ToLower(allowedRepoName) == strings.ToLower(targetRepoName)) {
return true return true
} }
} }