Skip to content

Commit abba4c0

Browse files
shaun-nxshaun-nx
authored
Merge branch 'main' into feat/pipeline-certfication-testing
2 parents 2141280 + d1300f7 commit abba4c0

File tree

3 files changed

+12
-20
lines changed

3 files changed

+12
-20
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
if [[ "${{ secrets.ARTIFACTORY_USER }}" == "" ]]; then
6161
echo "No Artifactory secrets available - using direct GOPROXY"
6262
GOPROXY_VALUE="direct"
63-
elif [[ "${{ inputs.is_production_release }}" == "true" ]] || [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" == "refs/heads/main" ]]; then
63+
elif [[ "${{ inputs.is_production_release }}" == "true" ]] || [[ ("${{ github.event_name }}" == "push" || "${{ github.event_name }}" == "schedule") && "${{ github.ref }}" == "refs/heads/main" ]]; then
6464
echo "Production mode - using production Artifactory"
6565
GOPROXY_VALUE="https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_ENDPOINT }}"
6666
else
@@ -167,7 +167,7 @@ jobs:
167167

168168
binary:
169169
name: Build Binary
170-
runs-on: ${{ github.repository_owner == 'nginx' && (inputs.is_production_release || (github.event_name == 'push' && github.ref == 'refs/heads/main')) && 'ubuntu-24.04-amd64' || 'ubuntu-24.04' }}
170+
runs-on: ${{ github.repository_owner == 'nginx' && (inputs.is_production_release || ((github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main')) && 'ubuntu-24.04-amd64' || 'ubuntu-24.04' }}
171171
needs: [vars, unit-tests, njs-unit-tests]
172172
outputs:
173173
json: ${{ steps.gateway_binaries.outputs.json }}
@@ -187,7 +187,7 @@ jobs:
187187
if [[ "${{ secrets.ARTIFACTORY_USER }}" == "" ]]; then
188188
echo "No Artifactory secrets available - using direct GOPROXY"
189189
GOPROXY_VALUE="direct"
190-
elif [[ "${{ inputs.is_production_release }}" == "true" ]] || [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" == "refs/heads/main" ]]; then
190+
elif [[ "${{ inputs.is_production_release }}" == "true" ]] || [[ ("${{ github.event_name }}" == "push" || "${{ github.event_name }}" == "schedule") && "${{ github.ref }}" == "refs/heads/main" ]]; then
191191
echo "Production mode - using production Artifactory"
192192
GOPROXY_VALUE="https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_ENDPOINT }}"
193193
else
@@ -288,16 +288,8 @@ jobs:
288288
- name: Configure GOPROXY
289289
id: goproxy
290290
run: |
291-
if [[ "${{ secrets.ARTIFACTORY_USER }}" == "" ]]; then
292-
echo "No Artifactory secrets available - using direct GOPROXY"
293-
GOPROXY_VALUE="direct"
294-
elif [[ "${{ inputs.is_production_release }}" == "true" ]] || [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" == "refs/heads/main" ]]; then
295291
echo "Production mode - using production Artifactory"
296292
GOPROXY_VALUE="https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_ENDPOINT }}"
297-
else
298-
echo "Development mode - using dev Artifactory"
299-
GOPROXY_VALUE="https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_DEV_ENDPOINT }}"
300-
fi
301293
echo "GOPROXY=${GOPROXY_VALUE}" >> $GITHUB_ENV
302294
303295
- name: Setup Golang Environment
@@ -359,8 +351,8 @@ jobs:
359351
platforms: ${{ matrix.platforms }}
360352
build-os: ${{ matrix.build-os }}
361353
tag: ${{ inputs.release_version || '' }}
362-
dry_run: ${{ inputs.dry_run || false }}
363-
runner: ${{ github.repository_owner == 'nginx' && (inputs.is_production_release || (github.event_name == 'push' && github.ref == 'refs/heads/main')) && 'ubuntu-24.04-amd64' || 'ubuntu-24.04' }}
354+
dry_run: ${{ inputs.dry_run || false}}
355+
runner: ${{ github.repository_owner == 'nginx' && (inputs.is_production_release || ((github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main')) && 'ubuntu-24.04-amd64' || 'ubuntu-24.04' }}
364356
permissions:
365357
contents: read # for docker/build-push-action to read repo content
366358
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
@@ -382,7 +374,7 @@ jobs:
382374
build-os: ${{ matrix.build-os }}
383375
tag: ${{ inputs.release_version || '' }}
384376
dry_run: ${{ inputs.dry_run || false }}
385-
runner: ${{ github.repository_owner == 'nginx' && (inputs.is_production_release || (github.event_name == 'push' && github.ref == 'refs/heads/main')) && 'ubuntu-24.04-amd64' || 'ubuntu-24.04' }}
377+
runner: ${{ github.repository_owner == 'nginx' && (inputs.is_production_release || ((github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main')) && 'ubuntu-24.04-amd64' || 'ubuntu-24.04' }}
386378
permissions:
387379
contents: read # for docker/build-push-action to read repo content
388380
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
@@ -399,7 +391,7 @@ jobs:
399391
platforms: "linux/arm64, linux/amd64"
400392
tag: ${{ inputs.operator_version || '' }}
401393
dry_run: ${{ inputs.dry_run || false }}
402-
runner: ${{ github.repository_owner == 'nginx' && (inputs.is_production_release || (github.event_name == 'push' && github.ref == 'refs/heads/main')) && 'ubuntu-24.04-amd64' || 'ubuntu-24.04' }}
394+
runner: ${{ github.repository_owner == 'nginx' && (inputs.is_production_release || ((github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main')) && 'ubuntu-24.04-amd64' || 'ubuntu-24.04' }}
403395
permissions:
404396
contents: read # for docker/build-push-action to read repo content
405397
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
@@ -497,7 +489,7 @@ jobs:
497489

498490
publish-helm:
499491
name: Package and Publish Helm Chart
500-
runs-on: ${{ github.repository_owner == 'nginx' && (inputs.is_production_release || (github.event_name == 'push' && github.ref == 'refs/heads/main')) && 'ubuntu-24.04-amd64' || 'ubuntu-24.04' }}
492+
runs-on: ${{ github.repository_owner == 'nginx' && (inputs.is_production_release || ((github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main')) && 'ubuntu-24.04-amd64' || 'ubuntu-24.04' }}
501493
needs: [vars, helm-tests]
502494
if: ${{ (inputs.is_production_release && (inputs.dry_run == false || inputs.dry_run == null)) || (github.event_name == 'push' && ! startsWith(github.ref, 'refs/heads/release-')) }}
503495
permissions:

‎build/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ ENV BUILD_AGENT=${BUILD_AGENT}
2020
ENTRYPOINT [ "/usr/bin/gateway" ]
2121

2222
FROM common AS container
23-
COPY --from=builder /go/src/github.com/nginxinc/nginx-gateway-fabric/build/out/gateway /usr/bin/
23+
COPY --chmod=0755 --from=builder /go/src/github.com/nginx/nginx-gateway-fabric/build/out/gateway /usr/bin/
2424

2525
FROM common AS local
26-
COPY ./build/out/gateway /usr/bin/
26+
COPY --chmod=0755 ./build/out/gateway /usr/bin/
2727

2828
FROM common AS goreleaser
2929
ARG TARGETARCH
30-
COPY dist/gateway_linux_$TARGETARCH*/gateway /usr/bin/
30+
COPY --chmod=0755 dist/gateway_linux_$TARGETARCH*/gateway /usr/bin/

‎tests/scripts/sync-files-to-vm.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ NGF_DIR=$(dirname "$PWD")/
88

99
gcloud compute config-ssh --ssh-config-file ngf-gcp.ssh >/dev/null
1010

11-
rsync -ave 'ssh -F ngf-gcp.ssh' "${NGF_DIR}" username@"${RESOURCE_NAME}"."${GKE_CLUSTER_ZONE}"."${GKE_PROJECT}":~/nginx-gateway-fabric
11+
rsync -ave 'ssh -F ngf-gcp.ssh' --exclude '.git' "${NGF_DIR}" username@"${RESOURCE_NAME}"."${GKE_CLUSTER_ZONE}"."${GKE_PROJECT}":~/nginx-gateway-fabric

0 commit comments

Comments
 (0)