Skip to content

Commit 0a02854

Browse files
authored
Update go proxy usage (#9518)
1 parent c3673fe commit 0a02854

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,7 @@ jobs:
102102
echo "chart_version=${HELM_CHART_VERSION}" >> $GITHUB_OUTPUT
103103
forked_workflow=${{ (github.event.pull_request && github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name) || github.repository != 'nginx/kubernetes-ingress' }}
104104
echo "forked_workflow=${forked_workflow}" >> $GITHUB_OUTPUT
105-
if [ "$forked_workflow" = "false" ] && [ "${{ github.ref_name }}" != "${{ github.event.repository.default_branch }}" ]; then
106-
echo "go_proxy=${{ secrets.ARTIFACTORY_DEV_ENDPOINT }}" >> $GITHUB_OUTPUT
107-
elif [ "${{ github.ref_name }}" = "${{ github.event.repository.default_branch }}" ] || [[ "${{ github.ref_name }}" =~ "release-" ]]; then
108-
echo "go_proxy=${{ secrets.ARTIFACTORY_ENDPOINT }}" >> $GITHUB_OUTPUT
109-
else
110-
echo "go_proxy=https://proxy.golang.org,direct" >> $GITHUB_OUTPUT
111-
fi
105+
echo "go_proxy=https://proxy.golang.org,direct" >> $GITHUB_OUTPUT
112106
./.github/scripts/variables.sh go_code_md5 >> $GITHUB_OUTPUT
113107
./.github/scripts/variables.sh docker_md5 >> $GITHUB_OUTPUT
114108
./.github/scripts/variables.sh build_tag >> $GITHUB_OUTPUT

.github/workflows/image-promotion.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
id: vars
6060
run: |
6161
echo "go_path=$(go env GOPATH)" >> $GITHUB_OUTPUT
62-
echo "go_proxy=${{ secrets.ARTIFACTORY_ENDPOINT }}" >> $GITHUB_OUTPUT
62+
echo "go_proxy=${{ secrets.ARTIFACTORY_DEV_ENDPOINT }}" >> $GITHUB_OUTPUT
6363
source .github/data/version.txt
6464
echo "ic_version=${IC_VERSION}" >> $GITHUB_OUTPUT
6565
echo "chart_version=${HELM_CHART_VERSION}" >> $GITHUB_OUTPUT
@@ -118,7 +118,7 @@ jobs:
118118
119119
govulncheck:
120120
name: Run govulncheck
121-
runs-on: ubuntu-24.04
121+
runs-on: ubuntu-24.04-amd64
122122
permissions:
123123
contents: read
124124
security-events: write

0 commit comments

Comments
 (0)