Skip to content

Commit c40c11c

Browse files
anujc25anujc25
authored
Merge branch 'v8' into marck/generateFakes
2 parents c99d814 + 3fcd823 commit c40c11c

13 files changed

Lines changed: 112 additions & 71 deletions

‎.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@v6
13+
uses: actions/checkout@v7
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@v6
49+
uses: actions/checkout@v7
5050
with:
5151
repository: cloudfoundry/bosh-bootloader
5252
path: bosh-bootloader
5353

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

@@ -103,14 +103,14 @@ jobs:
103103
gsutil -m cp -R -P ./$env_name gs://cf-cli-bosh-lites/
104104
105105
- name: Checkout cf-deployment
106-
uses: actions/checkout@v6
106+
uses: actions/checkout@v7
107107
with:
108108
repository: cloudfoundry/cf-deployment
109109
ref: release-candidate
110110
path: cf-deployment
111111

112112
- name: Checkout bosh-deployment
113-
uses: actions/checkout@v6
113+
uses: actions/checkout@v7
114114
with:
115115
repository: cloudfoundry/bosh-deployment
116116
path: bosh-deployment

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

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ env:
1919
BOSH_DEPLOYMENT: cf
2020
BOSH_NON_INTERACTIVE: true
2121
ENV_NAME: ${{ inputs.env-name }}
22+
BBL_CLI_VERSION: ${{ vars.BBL_CLI_VERSION }}
23+
BOSH_CLI_VERSION: ${{ vars.BOSH_CLI_VERSION }}
2224

2325
jobs:
2426
delete-env:
@@ -31,27 +33,25 @@ jobs:
3133
go version
3234
3335
install_location=/usr/local/bin
34-
bbl_version=v9.0.35
35-
bosh_cli_artifact=bosh-cli-7.7.2-linux-amd64
36-
37-
sudo curl https://github.com/cloudfoundry/bosh-bootloader/releases/download/${bbl_version}/bbl-${bbl_version}_linux_amd64 --silent --location --output $install_location/bbl
36+
37+
sudo curl https://github.com/cloudfoundry/bosh-bootloader/releases/download/v${BBL_CLI_VERSION}/bbl-v${BBL_CLI_VERSION}_linux_amd64 --silent --location --output $install_location/bbl
3838
sudo chmod +x $install_location/bbl
3939
bbl --version
40-
41-
sudo curl https://github.com/cloudfoundry/bosh-cli/releases/download/v7.7.2/$bosh_cli_artifact --silent --output $install_location/bosh --location
40+
41+
sudo curl https://github.com/cloudfoundry/bosh-cli/releases/download/v${BOSH_CLI_VERSION}/bosh-cli-${BOSH_CLI_VERSION}-linux-amd64 --silent --output $install_location/bosh --location
4242
sudo chmod +x $install_location/bosh
4343
bosh --version
4444
4545
sudo apt update
4646
sudo apt install -y build-essential unzip wamerican
4747

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

5353
- name: Checkout bosh-bootloader
54-
uses: actions/checkout@v6
54+
uses: actions/checkout@v7
5555
with:
5656
repository: cloudfoundry/bosh-bootloader
5757
path: bosh-bootloader
@@ -72,10 +72,14 @@ jobs:
7272
run: |
7373
cd ${ENV_NAME}/bbl-state
7474
eval "$(bbl print-env --shell-type posix)"
75-
75+
76+
# Delete the CF deployment first so warden containers release their
77+
# bind mounts on the director's persistent disk.
78+
echo "Deleting CF deployment ${BOSH_DEPLOYMENT}"
79+
bosh delete-deployment -d ${BOSH_DEPLOYMENT} --force --skip-drain || true
80+
7681
echo "Deleting env ${ENV_NAME}"
77-
echo ${BBL_GCP_SERVICE_ACCOUNT_KEY} > key.json
78-
bbl down --no-confirm --gcp-service-account-key=key.json
82+
bbl down --no-confirm
7983
8084
- name: delete gcs bucket
8185
run: |

‎.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@v6
26+
- uses: actions/checkout@v7
2727
with:
2828
fetch-depth: '0'
2929
- name: Set up Go 1.x
@@ -41,7 +41,7 @@ jobs:
4141
runs-on: ubuntu-latest
4242
steps:
4343
- name: Checkout
44-
uses: actions/checkout@v6
44+
uses: actions/checkout@v7
4545
with:
4646
fetch-depth: '0'
4747
- name: Set Up Go

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

Lines changed: 13 additions & 13 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@v6
74+
uses: actions/checkout@v7
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@v6
130+
uses: actions/checkout@v7
131131

132132
- name: Checkout cli-ci
133-
uses: actions/checkout@v6
133+
uses: actions/checkout@v7
134134
with:
135135
repository: cloudfoundry/cli-ci.git
136136
path: cli-ci
@@ -151,7 +151,7 @@ jobs:
151151
go env
152152
153153
- name: Go Assets Cache
154-
uses: actions/cache@v5
154+
uses: actions/cache@v6
155155
with:
156156
path: |
157157
${{ steps.go-cache-paths.outputs.go-mod }}
@@ -396,17 +396,17 @@ jobs:
396396
run: echo "VERSION_BUILD $VERSION_BUILD"
397397

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

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

408408
- name: Checkout bomutils
409-
uses: actions/checkout@v6
409+
uses: actions/checkout@v7
410410
with:
411411
repository: hogliux/bomutils.git
412412
ref: 0.2
@@ -428,7 +428,7 @@ jobs:
428428
cat "$(brew --repository)/Library/Taps/pivotalsoftware/homebrew-gon/gon.rb" > .github/brew-formulae
429429
430430
- name: Configure Homebrew cache
431-
uses: actions/cache@v5
431+
uses: actions/cache@v6
432432
with:
433433
path: |
434434
~/Library/Caches/Homebrew/gon--*
@@ -448,7 +448,7 @@ jobs:
448448
go env
449449
450450
- name: Go Assets Cache
451-
uses: actions/cache@v5
451+
uses: actions/cache@v6
452452
with:
453453
path: |
454454
${{ steps.go-cache-paths.outputs.go-mod }}
@@ -624,7 +624,7 @@ jobs:
624624
VERSION_MAJOR: ${{ needs.setup.outputs.version-major }}
625625
steps:
626626
- name: Checkout
627-
uses: actions/checkout@v6
627+
uses: actions/checkout@v7
628628
with:
629629
fetch-depth: 0
630630
- name: Set up Go
@@ -767,7 +767,7 @@ jobs:
767767
steps:
768768

769769
- name: Checkout cli
770-
uses: actions/checkout@v6
770+
uses: actions/checkout@v7
771771

772772
- name: Download signed artifacts
773773
uses: actions/download-artifact@v8
@@ -1014,7 +1014,7 @@ jobs:
10141014
path: ${{ env.ARTIFACTS_DIR }}
10151015

10161016
- name: Checkout CLI
1017-
uses: actions/checkout@v6
1017+
uses: actions/checkout@v7
10181018
with:
10191019
path: ${{ env.REPO_DIR }}
10201020

@@ -1054,7 +1054,7 @@ jobs:
10541054
VERSION_BUILD: ${{ needs.setup.outputs.version-build }}
10551055
steps:
10561056
- name: Checkout CLAW
1057-
uses: actions/checkout@v6
1057+
uses: actions/checkout@v7
10581058
with:
10591059
repository: cloudfoundry/CLAW
10601060
ref: master

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

Lines changed: 6 additions & 6 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@v6
33+
uses: actions/checkout@v7
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@v6
74+
uses: actions/checkout@v7
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@v6
81+
uses: actions/checkout@v7
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@v6
249+
uses: actions/checkout@v7
250250

251251
- uses: ruby/setup-ruby@v1
252252
with:
@@ -485,7 +485,7 @@ jobs:
485485
echo "VERSION_BUILD: ${VERSION_BUILD}"
486486
487487
- name: Checkout
488-
uses: actions/checkout@v6
488+
uses: actions/checkout@v7
489489

490490
- name: Calculate Checksums
491491
run: |
@@ -586,7 +586,7 @@ jobs:
586586
echo "Environment: ${ENVIRONMENT}"
587587
588588
- name: Checkout
589-
uses: actions/checkout@v6
589+
uses: actions/checkout@v7
590590
with:
591591
repository: cloudfoundry/cli
592592
ref: ${{ github.ref_name }}

‎.github/workflows/remove-safe-to-test-label.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Remove safe-to-test label on new commits
2+
3+
on:
4+
pull_request_target:
5+
branches:
6+
- main
7+
- v8
8+
types:
9+
- synchronize
10+
11+
jobs:
12+
remove-label:
13+
runs-on: ubuntu-latest
14+
permissions:
15+
pull-requests: write
16+
if: contains(github.event.pull_request.labels.*.name, 'safe-to-test')
17+
steps:
18+
- name: Remove safe-to-test label
19+
run: gh pr edit "${{ github.event.pull_request.number }}" --remove-label "safe-to-test" --repo "${{ github.repository }}"
20+
env:
21+
GH_TOKEN: ${{ github.token }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Checkout cli
35-
uses: actions/checkout@v6
35+
uses: actions/checkout@v7
3636
with:
3737
ref: ${{inputs.gitRef}}
3838
fetch-depth: 0
3939
path: cli
4040

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

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

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ on:
2525
branches:
2626
- main
2727
- v8
28+
types:
29+
- opened
30+
- synchronize
31+
- reopened
32+
- labeled
2833
paths-ignore:
2934
- "doc/**"
3035
- ".gitpod.yml"
@@ -33,7 +38,15 @@ on:
3338
jobs:
3439
get-sha:
3540
runs-on: ubuntu-latest
36-
if: ${{ github.actor != 'dependabot[bot]' }}
41+
if: |
42+
${{ github.actor != 'dependabot[bot]' && (
43+
github.event_name == 'workflow_dispatch' ||
44+
github.event_name == 'push' ||
45+
github.event.pull_request.author_association == 'OWNER' ||
46+
github.event.pull_request.author_association == 'COLLABORATOR' ||
47+
(github.event.action == 'labeled' &&
48+
github.event.label.name == 'safe-to-test')
49+
) }}
3750
outputs:
3851
gitRef: ${{steps.calculate.outputs.ref}}
3952
steps:
@@ -45,6 +58,9 @@ jobs:
4558
elif [[ "${{ github.event_name }}" == "push" ]]; then
4659
echo "checkout push request ${{github.event.push.after}}"
4760
echo "ref=${{github.event.push.after}}" >> $GITHUB_OUTPUT
61+
elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
62+
echo "checkout workflow_dispatch ref ${{ github.sha }}"
63+
echo "ref=${{ github.sha }}" >> $GITHUB_OUTPUT
4864
else
4965
echo "checkout else ${{ github.event.workflow_run.head_sha }}"
5066
echo "ref=${{github.event.workflow_run.head_sha}}" >> $GITHUB_OUTPUT
@@ -56,7 +72,7 @@ jobs:
5672
- get-sha
5773
steps:
5874
- name: Checkout
59-
uses: actions/checkout@v6
75+
uses: actions/checkout@v7
6076
with:
6177
ref: ${{needs.get-sha.outputs.gitRef}}
6278
fetch-depth: 0
@@ -86,7 +102,7 @@ jobs:
86102
- create-cf-env
87103
outputs:
88104
env-name: ${{ steps.set-name.outputs.env-name }}
89-
if: ${{ always() && github.actor != 'dependabot[bot]' }}
105+
if: ${{ always() && needs.get-sha.result == 'success' && github.actor != 'dependabot[bot]' }}
90106
steps:
91107
- name: set env name
92108
id: set-name

‎.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@v6
48+
uses: actions/checkout@v7
4949

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

0 commit comments

Comments
 (0)