From 4c65fad7c266d4a01d6fe63b4a2874dc49c56ae5 Mon Sep 17 00:00:00 2001 From: yylt Date: Tue, 22 Oct 2024 13:49:26 +0800 Subject: [PATCH] ingress --- .github/workflows/ingress.yaml | 35 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ingress.yaml b/.github/workflows/ingress.yaml index 5ab7d71..57d9155 100644 --- a/.github/workflows/ingress.yaml +++ b/.github/workflows/ingress.yaml @@ -17,7 +17,7 @@ on: default: 'release-1.9' env: PROJECT: ingress-nginx - BRANCH: nginx-0.49.3-es # release-1.9 or nginx-0.49.3-es, SCRIPT_VERSION must comtible + BRANCH: gmssl # release-1.9 or nginx-0.49.3-es, SCRIPT_VERSION must comtible SCRIPT_VERSION: 0.49 #1.9 or 0.49 REGISTRY_NAME: "docker.io" REGISTRY_USER: "${{ secrets.DOCKER_HUB_USER }}" @@ -37,14 +37,6 @@ jobs: username: ${{ env.REGISTRY_USER }} password: ${{ env.REGISTRY_PASS }} - - name: Check out build code - uses: actions/checkout@v4 - with: - repository: easystack/${{ env.PROJECT }} - ref: ${{ env.BRANCH }} - token: ${{ secrets.KPULL }} - path: ${{ env.PROJECT }} - - name: Setting run: | set -x @@ -57,6 +49,15 @@ jobs: echo "BRANCH is ${{ env.BRANCH }}" echo "SCRIPT_VERSION is ${{ env.SCRIPT_VERSION }}" + - name: Check out build code + uses: actions/checkout@v4 + with: + repository: easystack/${{ env.PROJECT }} + ref: ${{ env.BRANCH }} + token: ${{ secrets.KPULL }} + path: ${{ env.PROJECT }} + + - name: Image Build And Push uses: ./.github/actions/ingress with: @@ -77,14 +78,6 @@ jobs: username: ${{ env.REGISTRY_USER }} password: ${{ env.REGISTRY_PASS }} - - name: Check out build code - uses: actions/checkout@v4 - with: - repository: easystack/${{ env.PROJECT }} - ref: ${{ env.BRANCH }} - token: ${{ secrets.KPULL }} - path: ${{ env.PROJECT }} - - name: Setting run: | set -x @@ -97,6 +90,14 @@ jobs: echo "BRANCH is ${{ env.BRANCH }}" echo "SCRIPT_VERSION is ${{ env.SCRIPT_VERSION }}" + - name: Check out build code + uses: actions/checkout@v4 + with: + repository: easystack/${{ env.PROJECT }} + ref: ${{ env.BRANCH }} + token: ${{ secrets.KPULL }} + path: ${{ env.PROJECT }} + - name: Image Build And Push uses: ./.github/actions/ingress with: