Skip to content

Commit cf50b14

Browse files
gururajshgururajsh
authored
Merge branch 'main' into it-test-improvements-main
2 parents e14f688 + ed74674 commit cf50b14

20 files changed

+227
-78
lines changed

‎.github/workflows/check-cves.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- name: Check out codebase
13-
uses: actions/checkout@v5
13+
uses: actions/checkout@v6
1414

1515
- name: Scan current project
1616
id: scan

‎.github/workflows/create-bosh-lite.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ jobs:
4646
sudo apt install -y build-essential unzip wamerican
4747

4848
- name: Checkout bosh-bootloader
49-
uses: actions/checkout@v5
49+
uses: actions/checkout@v6
5050
with:
5151
repository: cloudfoundry/bosh-bootloader
5252
path: bosh-bootloader
5353

5454
- name: Checkout cli
55-
uses: actions/checkout@v5
55+
uses: actions/checkout@v6
5656
with:
5757
path: cli
5858

@@ -97,14 +97,14 @@ jobs:
9797
gsutil -m cp -R -P ./$env_name gs://cf-cli-bosh-lites/
9898
9999
- name: Checkout cf-deployment
100-
uses: actions/checkout@v5
100+
uses: actions/checkout@v6
101101
with:
102102
repository: cloudfoundry/cf-deployment
103103
ref: release-candidate
104104
path: cf-deployment
105105

106106
- name: Checkout bosh-deployment
107-
uses: actions/checkout@v5
107+
uses: actions/checkout@v6
108108
with:
109109
repository: cloudfoundry/bosh-deployment
110110
path: bosh-deployment

‎.github/workflows/delete-bosh-lite.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ jobs:
4646
sudo apt install -y build-essential unzip wamerican
4747

4848
- name: Checkout cli
49-
uses: actions/checkout@v5
49+
uses: actions/checkout@v6
5050
with:
5151
path: cli
5252

5353
- name: Checkout bosh-bootloader
54-
uses: actions/checkout@v5
54+
uses: actions/checkout@v6
5555
with:
5656
repository: cloudfoundry/bosh-bootloader
5757
path: bosh-bootloader

‎.github/workflows/golangci-lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
name: lint
2424
runs-on: ubuntu-latest
2525
steps:
26-
- uses: actions/checkout@v5
26+
- uses: actions/checkout@v6
2727
with:
2828
fetch-depth: '0'
2929
- name: Set up Go 1.x
@@ -40,7 +40,7 @@ jobs:
4040
runs-on: ubuntu-latest
4141
steps:
4242
- name: Checkout
43-
uses: actions/checkout@v5
43+
uses: actions/checkout@v6
4444
with:
4545
fetch-depth: '0'
4646
- name: Set Up Go

‎.github/workflows/release-build-sign-upload.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171

7272
steps:
7373
- name: Checkout cli
74-
uses: actions/checkout@v5
74+
uses: actions/checkout@v6
7575

7676
- name: Bump version
7777
id: bump-version
@@ -127,10 +127,10 @@ jobs:
127127
run: echo "VERSION_BUILD $VERSION_BUILD"
128128

129129
- name: Checkout cli
130-
uses: actions/checkout@v5
130+
uses: actions/checkout@v6
131131

132132
- name: Checkout cli-ci
133-
uses: actions/checkout@v5
133+
uses: actions/checkout@v6
134134
with:
135135
repository: cloudfoundry/cli-ci.git
136136
path: cli-ci
@@ -396,17 +396,17 @@ jobs:
396396
run: echo "VERSION_BUILD $VERSION_BUILD"
397397

398398
- name: Checkout cli
399-
uses: actions/checkout@v5
399+
uses: actions/checkout@v6
400400

401401
- name: Checkout cli-ci
402-
uses: actions/checkout@v5
402+
uses: actions/checkout@v6
403403
with:
404404
repository: cloudfoundry/cli-ci.git
405405
path: cli-ci
406406
ref: main
407407

408408
- name: Checkout bomutils
409-
uses: actions/checkout@v5
409+
uses: actions/checkout@v6
410410
with:
411411
repository: hogliux/bomutils.git
412412
ref: 0.2
@@ -625,7 +625,7 @@ jobs:
625625
VERSION_MAJOR: ${{ needs.setup.outputs.version-major }}
626626
steps:
627627
- name: Checkout
628-
uses: actions/checkout@v5
628+
uses: actions/checkout@v6
629629
with:
630630
fetch-depth: 0
631631
- name: Set up Go
@@ -768,7 +768,7 @@ jobs:
768768
steps:
769769

770770
- name: Checkout cli
771-
uses: actions/checkout@v5
771+
uses: actions/checkout@v6
772772

773773
- name: Download signed artifacts
774774
uses: actions/download-artifact@v6
@@ -1019,7 +1019,7 @@ jobs:
10191019
path: ${{ env.ARTIFACTS_DIR }}
10201020

10211021
- name: Checkout CLI
1022-
uses: actions/checkout@v5
1022+
uses: actions/checkout@v6
10231023
with:
10241024
path: ${{ env.REPO_DIR }}
10251025

@@ -1059,7 +1059,7 @@ jobs:
10591059
VERSION_BUILD: ${{ needs.setup.outputs.version-build }}
10601060
steps:
10611061
- name: Checkout CLAW
1062-
uses: actions/checkout@v5
1062+
uses: actions/checkout@v6
10631063
with:
10641064
repository: cloudfoundry/CLAW
10651065
ref: master

‎.github/workflows/release-update-repos.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run: echo "claw-url=https://packages.cloudfoundry.org" >> "${GITHUB_OUTPUT}"
3131

3232
- name: Checkout cli
33-
uses: actions/checkout@v5
33+
uses: actions/checkout@v6
3434

3535
- name: Parse semver
3636
id: parse-semver
@@ -71,14 +71,14 @@ jobs:
7171
steps:
7272

7373
- name: Checkout cli-ci
74-
uses: actions/checkout@v5
74+
uses: actions/checkout@v6
7575
with:
7676
repository: cloudfoundry/cli-ci.git
7777
ref: main
7878
path: cli-ci
7979

8080
- name: Checkout homebrew-tap
81-
uses: actions/checkout@v5
81+
uses: actions/checkout@v6
8282
with:
8383
repository: cloudfoundry/homebrew-tap
8484
ref: master
@@ -246,7 +246,7 @@ jobs:
246246
echo "VERSION_BUILD: ${VERSION_BUILD}"
247247
248248
- name: Checkout
249-
uses: actions/checkout@v5
249+
uses: actions/checkout@v6
250250

251251
- uses: ruby/setup-ruby@v1
252252
with:
@@ -489,7 +489,7 @@ jobs:
489489
echo "VERSION_BUILD: ${VERSION_BUILD}"
490490
491491
- name: Checkout
492-
uses: actions/checkout@v5
492+
uses: actions/checkout@v6
493493

494494
- name: Calculate Checksums
495495
run: |

‎.github/workflows/tests-integration-reusable.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
env:
2020
ENV_NAME: ${{ inputs.env-name }}
2121
NODES: 12
22-
FLAKE_ATTEMPTS: ${{ vars.TEST_FLAKE_ATTEMPTS || '4' }}
22+
FLAKE_ATTEMPTS: ${{ vars.TEST_FLAKE_ATTEMPTS || '5' }}
2323
BBL_CLI_VERSION: ${{ vars.BBL_CLI_VERSION }}
2424
BOSH_CLI_VERSION: ${{ vars.BOSH_CLI_VERSION }}
2525
CREDHUB_CLI_VERSION: ${{ vars.CREDHUB_CLI_VERSION }}
@@ -32,14 +32,14 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Checkout cli
35-
uses: actions/checkout@v5
35+
uses: actions/checkout@v6
3636
with:
3737
ref: ${{inputs.gitRef}}
3838
fetch-depth: 0
3939
path: cli
4040

4141
- name: Checkout CF deployment tasks
42-
uses: actions/checkout@v5
42+
uses: actions/checkout@v6
4343
with:
4444
repository: cloudfoundry/cf-deployment-concourse-tasks
4545
path: cf-deployment-concourse-tasks

‎.github/workflows/tests-integration.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- get-sha
5959
steps:
6060
- name: Checkout
61-
uses: actions/checkout@v5
61+
uses: actions/checkout@v6
6262
with:
6363
ref: ${{needs.get-sha.outputs.gitRef}}
6464
fetch-depth: 0
@@ -121,11 +121,13 @@ jobs:
121121
needs:
122122
- get-sha
123123
- set-env-name
124+
- run-integration-tests-cf-env
124125
if: ${{
125126
always() &&
126127
needs.set-env-name.result == 'success' &&
127128
(github.event_name != 'workflow_dispatch' || inputs.workflow == 'all' ||
128-
inputs.workflow == 'run-integration-tests-cf-env-with-client-creds') }}
129+
inputs.workflow == 'run-integration-tests-cf-env-with-client-creds') &&
130+
needs.run-integration-tests-cf-env.result != 'failure' }}
129131
uses: ./.github/workflows/tests-integration-reusable.yml
130132
with:
131133
name: Integration client creds

‎.github/workflows/tests-unit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
steps:
4747
- name: Checkout Repository
48-
uses: actions/checkout@v5
48+
uses: actions/checkout@v6
4949

5050
- name: Setup Go Environment
5151
uses: actions/setup-go@v6

‎.github/workflows/util-code-quality.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
steps:
2323

2424
- name: Checkout repository
25-
uses: actions/checkout@v5
25+
uses: actions/checkout@v6
2626

2727
- name: Initialize CodeQL
2828
uses: github/codeql-action/init@v4

0 commit comments

Comments
 (0)