Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Sai Kumar committed Dec 16, 2024
2 parents 44023ab + 107f351 commit eee138a
Show file tree
Hide file tree
Showing 2,095 changed files with 266,168 additions and 32,203 deletions.
2 changes: 2 additions & 0 deletions .github/labeler-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ service/Classic Infrastructure:
- '((\*|-) ?`?|(data|resource) "?)(ibm_compute|ibm_cdn|ibm_firewall|ibm_lb|ibm_lbaas|ibm_network|ibm_storage|ibm_security|ibm_subnet|ibm_hardware|ibm_ipsec)'
service/Cloud Databases:
- '((\*|-) ?`?|(data|resource) "?)ibm_(cloudant|database)'
service/Cloud Logs:
- '((\*|-) ?`?|(data|resource) "?)ibm_logs_'
service/Cloud Foundry:
- '((\*|-) ?`?|(data|resource) "?)(ibm_account|ibm_org|ibm_space|ibm_service|ibm_app_domain_private|ibm_app_domain_shared|ibm_app_route)'
service/CBR:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
steps:

- name: Set up Go 1.x
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ^1.18
go-version: ^1.19
id: go

- name: Check out code into the Go module directory
uses: actions/[email protected].1
uses: actions/[email protected].7

- name: Get dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ jobs:
labelIssues:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].7
- name: Apply Issue Labels
uses: github/issue-labeler@v3.3
uses: github/issue-labeler@v3.4
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/labeler-issue.yml
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,29 @@ jobs:
steps:
-
name: Checkout
uses: actions/[email protected].1
uses: actions/[email protected].7
-
name: Unshallow
run: git fetch --prune --unshallow
-
name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: 1.18
go-version: 1.22
-
name: Import GPG key
id: import_gpg
uses: crazy-max/ghaction-import-gpg@v6.0.0
uses: crazy-max/ghaction-import-gpg@v6.1.0
with:
# These secrets will need to be configured for the repository:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.PASSPHRASE }}
-
name: Run GoReleaser
uses: goreleaser/goreleaser-action@v5
uses: goreleaser/goreleaser-action@v6
with:
version: latest
args: release --rm-dist
version: v1.26.2
args: release --clean
env:
GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
# GitHub sets this automatically
Expand Down
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,12 @@ vendor/
!command/test-fixtures/**/*.tfstate
!command/test-fixtures/**/.terraform/

!jenkins/workflow.xml
*.sh

!createaddon.sh
!createcrd.sh
!deleteaddon.sh
!deletecrd.sh
!updatecrd.sh
!updateodf.sh
Loading

0 comments on commit eee138a

Please sign in to comment.