Skip to content

Commit 7761d25

Browse files
authored
Update GOPROXY for forks; skip UBI plus (#4493)
Problem: Due to a checksum mismatch for one dependency in the 'direct' GOPROXY, forked pipelines were failing. Solution: Add proxy.golang.org to the GOPROXY to allow this to pass.
1 parent 3b34047 commit 7761d25

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ permissions:
3535

3636
jobs:
3737
build:
38+
if: ${{ ! (github.event.pull_request.head.repo.fork && inputs.image == 'plus' && inputs.build-os == 'ubi') }}
3839
permissions:
3940
contents: read # for docker/build-push-action to read repo content
4041
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
run: |
121121
if [[ "${{ secrets.ARTIFACTORY_USER }}" == "" ]]; then
122122
echo "No Artifactory secrets available - using direct GOPROXY"
123-
GOPROXY_VALUE="direct"
123+
GOPROXY_VALUE="proxy.golang.org,direct"
124124
elif [[ "${{ inputs.is_production_release }}" == "true" ]] || [[ ("${{ github.event_name }}" == "push" || "${{ github.event_name }}" == "schedule") && ("${{ github.ref }}" == "refs/heads/main" || "${{ github.ref }}" =~ ^refs/heads/release-) ]]; then
125125
echo "Production mode - using production Artifactory"
126126
GOPROXY_VALUE="https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_ENDPOINT }}"
@@ -176,7 +176,7 @@ jobs:
176176
id: goproxy
177177
run: |
178178
if [[ "${{ secrets.ARTIFACTORY_USER }}" == "" ]]; then
179-
GOPROXY_VALUE="direct"
179+
GOPROXY_VALUE="proxy.golang.org,direct"
180180
else
181181
GOPROXY_VALUE="https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_DEV_ENDPOINT }}"
182182
fi
@@ -247,7 +247,7 @@ jobs:
247247
run: |
248248
if [[ "${{ secrets.ARTIFACTORY_USER }}" == "" ]]; then
249249
echo "No Artifactory secrets available - using direct GOPROXY"
250-
GOPROXY_VALUE="direct"
250+
GOPROXY_VALUE="proxy.golang.org,direct"
251251
elif [[ "${{ inputs.is_production_release }}" == "true" ]] || [[ ("${{ github.event_name }}" == "push" || "${{ github.event_name }}" == "schedule") && ("${{ github.ref }}" == "refs/heads/main" || "${{ github.ref }}" =~ ^refs/heads/release-) ]]; then
252252
echo "Production mode - using production Artifactory"
253253
GOPROXY_VALUE="https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_ENDPOINT }}"
@@ -574,7 +574,7 @@ jobs:
574574
id: goproxy
575575
run: |
576576
if [[ "${{ secrets.ARTIFACTORY_USER }}" == "" ]]; then
577-
GOPROXY_VALUE="direct"
577+
GOPROXY_VALUE="proxy.golang.org,direct"
578578
else
579579
GOPROXY_VALUE="https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_DEV_ENDPOINT }}"
580580
fi

.github/workflows/conformance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
id: goproxy
6060
run: |
6161
if [[ "${{ secrets.ARTIFACTORY_USER }}" == "" ]]; then
62-
GOPROXY_VALUE="direct"
62+
GOPROXY_VALUE="proxy.golang.org,direct"
6363
else
6464
GOPROXY_VALUE="https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_DEV_ENDPOINT }}"
6565
fi

.github/workflows/functional.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
id: goproxy
4242
run: |
4343
if [[ "${{ secrets.ARTIFACTORY_USER }}" == "" ]]; then
44-
GOPROXY_VALUE="direct"
44+
GOPROXY_VALUE="proxy.golang.org,direct"
4545
else
4646
GOPROXY_VALUE="https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_DEV_ENDPOINT }}"
4747
fi

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
id: goproxy
3636
run: |
3737
if [[ "${{ secrets.ARTIFACTORY_USER }}" == "" ]]; then
38-
GOPROXY_VALUE="direct"
38+
GOPROXY_VALUE="proxy.golang.org,direct"
3939
else
4040
GOPROXY_VALUE="https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_DEV_ENDPOINT }}"
4141
fi

.github/workflows/renovate-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
id: goproxy
5555
run: |
5656
if [[ "${{ secrets.ARTIFACTORY_USER }}" == "" ]]; then
57-
GOPROXY_VALUE="direct"
57+
GOPROXY_VALUE="proxy.golang.org,direct"
5858
else
5959
GOPROXY_VALUE="https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_DEV_ENDPOINT }}"
6060
fi

0 commit comments

Comments
 (0)