Skip to content

Commit 70c278d

Browse files
jochenehretjochenehret
committed
Merge remote-tracking branch 'origin/main' into bind-service_strategy_parameter-main
2 parents f491c8e + b180ff0 commit 70c278d

35 files changed

Lines changed: 390 additions & 189 deletions

‎.github/CONTRIBUTING.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ mailing list.
1010
The cf CLI follows a branching model:
1111
- V9 (Next major release) of the cf CLI is built from the [main branch](https://github.com/cloudfoundry/cli/tree/main). **This branch is under active development**.
1212
- V8 of the cf CLI is built from the [v8 branch](https://github.com/cloudfoundry/cli/tree/v8). **This branch is under active development**.
13-
- V7 of the cf CLI is built from the [v7 branch](https://github.com/cloudfoundry/cli/tree/v7). **This branch is maintenance only** and will only be updated to patch CVEs and very severe blocking defects.
14-
- V6 of the cf CLI is built from the [v6 branch](https://github.com/cloudfoundry/cli/tree/v6). **This branch is maintenance only** and will only be updated to patch CVEs and very severe blocking defects.
13+
- V7 of the cf CLI is built from the [v7 branch](https://github.com/cloudfoundry/cli/tree/v7). **This branch is no longer maintained**.
14+
- V6 of the cf CLI is built from the [v6 branch](https://github.com/cloudfoundry/cli/tree/v6). **This branch is no longer maintained**.
1515

1616
## Prerequisites
1717
Before working on a PR to the CLI code base, please:
@@ -33,11 +33,11 @@ After reaching out to the CLI team and the conclusion is to make a PR, please fo
3333
[Product Style Guide](https://github.com/cloudfoundry/cli/wiki/CLI-Product-Specific-Style-Guide),
3434
and [Internationalization Guide](https://github.com/cloudfoundry/cli/wiki/Internationalization-Guide).
3535
1. Fork the project repository.
36-
1. Create a feature branch from the earliest branch that's [appropriate for your change](#cli-versions) (e.g. `git checkout v7 && git checkout -b better_cli`) and make changes on this branch
36+
1. Create a feature branch from the earliest branch that's [appropriate for your change](#cli-versions) (e.g. `git checkout v8 && git checkout -b better_cli`) and make changes on this branch
3737
* Follow the other sections on this page to [set up your development environment](#development-environment-setup), [build `cf`](#building-the-cf-binary) and [run the tests](#testing).
3838
* Tests are required for any changes.
3939
1. Push to your fork (e.g. `git push origin better_cli`) and [submit a pull request](https://help.github.com/articles/creating-a-pull-request)
40-
1. The cf CLI team will merge your changes from the versioned branch (e.g. v7) to main for you after the PR is merged.
40+
1. The cf CLI team will merge your changes from the versioned branch (e.g. v8) to main for you after the PR is merged.
4141

4242
Note: All contributions must be sent using GitHub Pull Requests.
4343
We prefer a small, focused pull request with a clear message

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ Steps to reproduce the behavior; include the exact CLI commands and verbose outp
3232
- version of the CC API Release you are on
3333

3434
**Notes regarding V6 and V7 CLI support:**
35-
- V6:
36-
- Minimum supported version of CF Deployment: v7.0.0 (CAPI Release: 1.74.0 (APIs 2.128.0 and 3.63.0))
37-
- Maximum supported version of CF Deployment: v13.4.0 (CAPI Release: 1.94.0 (APIs 2.149.0 and 3.84.0))
38-
- V7:
39-
- Minimum supported version of CF Deployment: v13.5.0 (CAPI Release: 1.95.0 (APIs 2.150.0 and 3.85.0))
35+
- V6: **No longer maintained or released**
36+
- Last supported version of CF Deployment: v13.4.0 (CAPI Release: 1.94.0 (APIs 2.149.0 and 3.84.0))
37+
- V7: **No longer maintained or released**
38+
- Last supported version of CF Deployment: v13.5.0 (CAPI Release: 1.95.0 (APIs 2.150.0 and 3.85.0))
4039

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ A clear and concise description of any alternative solutions or features you've
3131
Add any other context or screenshots about the feature request here.
3232

3333
**Note:**
34-
As of the GA of the v7 CLI, the v6 line is no longer under active development and will be updated only to patch CVEs or fix severe blocking defects with no workarounds.
34+
The v7 and v6 CLI versions are no longer maintained.

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ If your contribution falls under a company CLA but your membership is not public
99
* Contributions must conform to our [style guide](https://github.com/cloudfoundry/cli/wiki/CLI-Product-Specific-Style-Guide). Please reach out to us if you have questions.
1010

1111

12-
#### Note: Please create separate PR for every branch (main, v8 and v7) as needed.
12+
#### Note: Please create separate PR for every branch (main and v8) as needed.
1313

1414
## Description of the Change
1515

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
if: always()
2727

2828
- name: Archive CVE scan results
29-
uses: actions/upload-artifact@v5
29+
uses: actions/upload-artifact@v6
3030
if: always()
3131
with:
3232
name: cve-scan-results-${{ github.sha }}-${{ github.run_id }}-${{ github.run_number }}

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ jobs:
151151
go env
152152
153153
- name: Go Assets Cache
154-
uses: actions/cache@v4
154+
uses: actions/cache@v5
155155
with:
156156
path: |
157157
${{ steps.go-cache-paths.outputs.go-mod }}
@@ -169,7 +169,7 @@ jobs:
169169
make out/cf-cli_linux_arm64
170170
171171
- name: Store Linux Binaries
172-
uses: actions/upload-artifact@v5
172+
uses: actions/upload-artifact@v6
173173
with:
174174
if-no-files-found: error
175175
name: cf-cli-linux-binaries
@@ -274,7 +274,7 @@ jobs:
274274
working-directory: signed-redhat-installer
275275

276276
- name: Store Signed Linux RPM Packages
277-
uses: actions/upload-artifact@v5
277+
uses: actions/upload-artifact@v6
278278
with:
279279
if-no-files-found: error
280280
name: cf-cli-linux-rpm-packages
@@ -375,7 +375,7 @@ jobs:
375375
working-directory: packaged-deb
376376

377377
- name: Store Debian Packages
378-
uses: actions/upload-artifact@v5
378+
uses: actions/upload-artifact@v6
379379
with:
380380
if-no-files-found: error
381381
name: cf-cli-linux-deb-packages
@@ -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@v4
431+
uses: actions/cache@v5
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@v4
451+
uses: actions/cache@v5
452452
with:
453453
path: |
454454
${{ steps.go-cache-paths.outputs.go-mod }}
@@ -465,7 +465,7 @@ jobs:
465465
make out/cf-cli_macosarm
466466
467467
- name: Store macOS Binaries
468-
uses: actions/upload-artifact@v5
468+
uses: actions/upload-artifact@v6
469469
with:
470470
if-no-files-found: error
471471
name: cf-cli-macos-binaries
@@ -605,7 +605,7 @@ jobs:
605605
"signed-macos-installer/cf${VERSION_MAJOR}-cli-installer_${VERSION_BUILD}_macosarm.pkg"
606606
607607
- name: Store macOS Signed Packages
608-
uses: actions/upload-artifact@v5
608+
uses: actions/upload-artifact@v6
609609
with:
610610
if-no-files-found: error
611611
name: cf-cli-macos-packages
@@ -691,7 +691,7 @@ jobs:
691691
New-Item -ItemType SymbolicLink -Target .\out\cf-cli_winx64.exe -Path .\out\cf-cli_winx64-link.exe
692692
693693
- name: Save signed binaries as a GitHub Action Artifact
694-
uses: actions/upload-artifact@v5
694+
uses: actions/upload-artifact@v6
695695
with:
696696
name: cf-cli-windows-binaries
697697
if-no-files-found: error
@@ -736,7 +736,7 @@ jobs:
736736
Get-ChildItem "${env:RUNNER_TEMP}"
737737
738738
- name: Save installer and dist files as a GitHub Action Artifact
739-
uses: actions/upload-artifact@v5
739+
uses: actions/upload-artifact@v6
740740
with:
741741
name: cf-cli-windows-packages
742742
if-no-files-found: error
@@ -771,7 +771,7 @@ jobs:
771771
uses: actions/checkout@v6
772772

773773
- name: Download signed artifacts
774-
uses: actions/download-artifact@v6
774+
uses: actions/download-artifact@v7
775775
with:
776776
path: signed # download all artifacts to 'signed/'
777777

@@ -857,7 +857,7 @@ jobs:
857857
signed/winx64/*zip
858858
859859
- name: Store Artifacts
860-
uses: actions/upload-artifact@v5
860+
uses: actions/upload-artifact@v6
861861
with:
862862
if-no-files-found: error
863863
name: final-artifacts
@@ -894,7 +894,7 @@ jobs:
894894
steps:
895895

896896
- name: Download Signed Linux Packages
897-
uses: actions/download-artifact@v6
897+
uses: actions/download-artifact@v7
898898
with:
899899
name: cf-cli-linux-rpm-packages
900900

@@ -921,7 +921,7 @@ jobs:
921921
steps:
922922

923923
- name: Download Signed Linux Packages
924-
uses: actions/download-artifact@v6
924+
uses: actions/download-artifact@v7
925925
with:
926926
name: cf-cli-linux-deb-packages
927927

@@ -949,7 +949,7 @@ jobs:
949949
steps:
950950

951951
- name: Download Signed macOS Packages
952-
uses: actions/download-artifact@v6
952+
uses: actions/download-artifact@v7
953953
with:
954954
name: cf-cli-macos-packages
955955

@@ -973,7 +973,7 @@ jobs:
973973
steps:
974974

975975
- name: Download Signed Windows Binaries
976-
uses: actions/download-artifact@v6
976+
uses: actions/download-artifact@v7
977977
with:
978978
name: cf-cli-windows-binaries
979979

@@ -983,7 +983,7 @@ jobs:
983983
Get-AuthenticodeSignature -Verbose -ErrorAction Stop .\cf-cli_winx64.exe
984984
985985
- name: Download Signed Windows Binaries
986-
uses: actions/download-artifact@v6
986+
uses: actions/download-artifact@v7
987987
with:
988988
name: cf-cli-windows-packages
989989

@@ -1013,7 +1013,7 @@ jobs:
10131013
- s3-upload
10141014
steps:
10151015
- name: Download signed artifacts
1016-
uses: actions/download-artifact@v6
1016+
uses: actions/download-artifact@v7
10171017
with:
10181018
name: final-artifacts
10191019
path: ${{ env.ARTIFACTS_DIR }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ jobs:
385385
# ls -R
386386
#
387387
# - name: Backup current Linux RPM repodata
388-
# uses: actions/upload-artifact@v5
388+
# uses: actions/upload-artifact@v6
389389
# with:
390390
# if-no-files-found: error
391391
# name: cf-cli-linux-rpm-repodata-backup
@@ -432,7 +432,7 @@ jobs:
432432
run: ls -R
433433

434434
- name: Store Linux RPM repodata
435-
uses: actions/upload-artifact@v5
435+
uses: actions/upload-artifact@v6
436436
with:
437437
if-no-files-found: error
438438
name: cf-cli-linux-rpm-repodata

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ on:
1818

1919
env:
2020
ENV_NAME: ${{ inputs.env-name }}
21-
NODES: 12
22-
FLAKE_ATTEMPTS: ${{ vars.TEST_FLAKE_ATTEMPTS || '4' }}
21+
NODES: 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 }}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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

‎Makefile‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
CF_DIAL_TIMEOUT ?= 15
22
NODES ?= 10
33
FLAKE_ATTEMPTS ?=5
4+
GINKGO_SUITE_TIMEOUT=2h
45
PACKAGES ?= api actor command types util version integration/helpers
56
LC_ALL = en_US.UTF-8
67

@@ -22,7 +23,7 @@ UNAME_S := $(shell uname -s)
2223
POLL_PROGRESS_THRESHOLD=120s
2324

2425
GINKGO_FLAGS ?= -r -randomize-all -require-suite
25-
GINKGO_INT_FLAGS = $(GINKGO_FLAGS) --poll-progress-after $(POLL_PROGRESS_THRESHOLD)
26+
GINKGO_INT_FLAGS = $(GINKGO_FLAGS) --poll-progress-after $(POLL_PROGRESS_THRESHOLD) --timeout $(GINKGO_SUITE_TIMEOUT)
2627
ginkgo_int = ginkgo $(GINKGO_INT_FLAGS)
2728

2829
GINKGO_UNITS_FLAGS = $(GINKGO_FLAGS) -randomize-suites
@@ -141,8 +142,12 @@ integration-full-tests: integration-tests-full
141142
integration-tests-full: build integration-cleanup integration-isolated integration-push integration-experimental integration-plugin integration-global integration-selfcontained ## Run all isolated, push, experimental, plugin, selfcontained, and global integration tests
142143

143144
integration-tests-full-ci: install-test-deps integration-cleanup
144-
$(ginkgo_int) -nodes $(NODES) -flake-attempts $(FLAKE_ATTEMPTS) \
145-
integration/shared/isolated integration/v7/isolated integration/shared/plugin integration/shared/experimental integration/v7/experimental integration/v7/push
145+
$(ginkgo_int) -nodes $(NODES) -flake-attempts $(FLAKE_ATTEMPTS) \
146+
integration/shared/isolated integration/v7/isolated
147+
$(ginkgo_int) -nodes $(NODES) -flake-attempts $(FLAKE_ATTEMPTS) \
148+
integration/shared/plugin integration/shared/experimental
149+
$(ginkgo_int) -nodes $(NODES) -flake-attempts $(FLAKE_ATTEMPTS) \
150+
integration/v7/experimental integration/v7/push
146151
$(ginkgo_int) -flake-attempts $(FLAKE_ATTEMPTS) integration/shared/global integration/v7/global
147152

148153
lint: format ## Runs all linters and formatters

0 commit comments

Comments
 (0)