From 9fb565d31032c32e7f85519721493edb9c462759 Mon Sep 17 00:00:00 2001 From: amass <168062547@qq.com> Date: Wed, 16 Oct 2024 00:16:50 +0800 Subject: [PATCH] fix ci. --- .gitea/workflows/build_ubuntu.yaml | 10 +++++----- .gitea/workflows/build_windows.yaml | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build_ubuntu.yaml b/.gitea/workflows/build_ubuntu.yaml index 021ddc6..43cc793 100644 --- a/.gitea/workflows/build_ubuntu.yaml +++ b/.gitea/workflows/build_ubuntu.yaml @@ -5,18 +5,18 @@ jobs: PullDocker: runs-on: [ubuntu-latest, ubuntu-24.04] steps: - - name: Login to Docker Registry - uses: docker/login-action@v2 + - name: Login to ACR + uses: aliyun/acr-login@v1 with: - registry: frp-by1.wwvvww.cn:45288 + login-server: https://registry.cn-shenzhen.aliyuncs.com username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Pull Docker image - run: docker pull frp-by1.wwvvww.cn:45288/ubuntu_dev:24.04 + run: docker pull registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04 Build: runs-on: [ubuntu-latest, ubuntu-24.04] container: - image: frp-by1.wwvvww.cn:45288/ubuntu_dev:24.04 + image: registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04 steps: - name: Check out repository code uses: actions/checkout@v4 diff --git a/.gitea/workflows/build_windows.yaml b/.gitea/workflows/build_windows.yaml index ee5f595..07e174d 100644 --- a/.gitea/workflows/build_windows.yaml +++ b/.gitea/workflows/build_windows.yaml @@ -7,7 +7,9 @@ jobs: steps: - name: Set up SSH run: | - mkdir $HOME\.ssh + if (-Not (Test-Path -Path $HOME\.ssh)) { + mkdir $HOME\.ssh + } echo $env:SSH_PRIVATE_KEY | Out-File -FilePath $HOME\.ssh\id_ed25519 -Encoding ascii icacls $HOME\.ssh\id_ed25519 /inheritance:r /grant:r "$($env:USERNAME):(F)" ssh-keyscan -t ed25519 -p 22022 frp-by1.wwvvww.cn | Out-File -FilePath $HOME\.ssh\known_hosts -Encoding ascii