Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into kaniko-context-pref…
Browse files Browse the repository at this point in the history
…ix-fix

* origin/master: (361 commits)
  fix vaultDisableOverwrite handling (SAP#4990)
  (fix) syft, fixing cyclone dx version to sbom version 1.4 for syft (SAP#4991)
  Update abapAddonAssemblyKitCheck.yaml (SAP#4992)
  Update abapAddonAssemblyKitCheck.yaml (SAP#4988)
  Find dist folder from sources (SAP#4984)
  Mend verbose mode improvements (SAP#4982)
  fix(groovy): handle NPE in utils unstash (SAP#4969)
  DetectExecuteScan enhance logging && Adding new parameter (includeDevDependencies) for WS step  (SAP#4958)
  Disable telemetry reporting (SAP#4983)
  Fixed excluded directories with pattern (SAP#4980)
  fix(credentialdiggerScan): get_discoveries and docker image (SAP#4613)
  Cleanup outdated blue green support for cf native build tools (SAP#4965)
  Excluded directory '.pipeline' for detectExecuteScan step (SAP#4955)
  chore: switch to new parameter name (SAP#4968)
  Improving buildDescriptorExcludeList for npm (SAP#4976)
  Resilience improvement for mend JRE download (SAP#4974)
  Adapt clone step to work with customer-managed Repos (BYOG) (SAP#4966)
  Publish TargetVector enhanced retry (SAP#4971)
  errorcause and remove telemetry warnings (SAP#4951)
  Enabled the possibility to avoid aggregation of NPM projects in WhitesourceExecuteScan (SAP#4956)
  ...
  • Loading branch information
maxatsap committed Jul 23, 2024
2 parents 2784ab5 + a564a12 commit e1ff1bb
Show file tree
Hide file tree
Showing 1,013 changed files with 38,077 additions and 12,795 deletions.
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ AbapEnvironment* @SAP/jenkins-library-abap
ascAppUpload* @Mau04 @inf2381
AscAppUpload* @Mau04 @inf2381

credentialdiggerScan* @SAP/credential-digger-members @SAP/credential-digger-admins
CredentialdiggerScan* @SAP/credential-digger-admins @SAP/credential-digger-members

#####################
# Integration tests #
#####################
Expand Down
10 changes: 10 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base"
],
"ignorePaths": [
"integration/testdata/**",
"test/resources/**"
]
}
4 changes: 2 additions & 2 deletions .github/workflows/build-adr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# required by Log4brains to work correctly (needs the whole Git history)
fetch-depth: 0
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "14"
- name: Install Log4brains And Build ADRs
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/consumer-tests-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- uses: styfle/cancel-workflow-action@0.10.0
- uses: styfle/cancel-workflow-action@0.11.0
- name: Get pull request URL
id: pull_request
run: |
Expand All @@ -40,13 +40,14 @@ jobs:
echo "branch_name=$(curl ${{ steps.pull_request.outputs.pull_request }} |
jq '.head.ref' |
sed 's/\"//g')" >> "$GITHUB_OUTPUT"
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: ${{ steps.repository.outputs.repository }}
ref: ${{ steps.branch_name.outputs.branch_name }}
- uses: actions/setup-java@v1
- uses: actions/setup-java@v4
with:
java-version: 11
distribution: zulu
- name: Install Groovy
run: |
sudo apt-get update
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/consumer-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- uses: styfle/cancel-workflow-action@0.10.0
- uses: actions/checkout@v3
- uses: actions/setup-java@v1
- uses: styfle/cancel-workflow-action@0.11.0
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 11
distribution: zulu
- name: Install Groovy
run: |
sudo apt-get update
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,32 @@ jobs:
Build:
runs-on: ubuntu-latest
steps:
- uses: styfle/cancel-workflow-action@0.10.0
- uses: styfle/cancel-workflow-action@0.11.0

- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: actions/setup-java@v1
- uses: actions/setup-java@v4
with:
java-version: '1.8'
java-version: 8
distribution: zulu

- uses: actions/setup-go@v1
- uses: actions/setup-go@v5
with:
go-version: '1.18.x'
go-version: '1.21.x'

- name: Install Groovy
run: sudo apt-get update && sudo apt-get install groovy -y

- name: Cache Maven Packages
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Cache Go Packages
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/integration-tests-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
sha: ${{ steps.sha.outputs.sha }}
runs-on: ubuntu-latest
steps:
- uses: styfle/cancel-workflow-action@0.10.0
- uses: styfle/cancel-workflow-action@0.11.0
- name: Get pull request URL
id: pull_request
run: |
Expand All @@ -42,7 +42,7 @@ jobs:
echo "branch_name=$(curl ${{ steps.pull_request.outputs.pull_request }} |
jq '.head.ref' |
sed 's/\"//g')" >> "$GITHUB_OUTPUT"
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: ${{ steps.repository.outputs.repository }}
ref: ${{ steps.branch_name.outputs.branch_name }}
Expand Down Expand Up @@ -71,10 +71,10 @@ jobs:
- start
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ needs.start.outputs.sha }}
- uses: actions/setup-go@v3
- uses: actions/setup-go@v5
with:
go-version: ${{ needs.start.outputs.go_version }}
- name: Build
Expand All @@ -95,10 +95,10 @@ jobs:
- start
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ needs.start.outputs.sha }}
- uses: actions/setup-go@v3
- uses: actions/setup-go@v5
with:
go-version: ${{ needs.start.outputs.go_version }}
- name: Build
Expand Down Expand Up @@ -127,10 +127,10 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ needs.start.outputs.sha }}
- uses: actions/setup-go@v3
- uses: actions/setup-go@v5
with:
go-version: ${{ needs.start.outputs.go_version }}
- name: Download Piper binary
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
sha: ${{ steps.sha.outputs.sha }}
runs-on: ubuntu-latest
steps:
- uses: styfle/cancel-workflow-action@0.10.0
- uses: actions/checkout@v3
- uses: styfle/cancel-workflow-action@0.11.0
- uses: actions/checkout@v4
- name: Get GO version
id: go_version
run: |
Expand All @@ -42,10 +42,10 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ needs.start.outputs.sha }}
- uses: actions/setup-go@v3
- uses: actions/setup-go@v5
with:
go-version: ${{ needs.start.outputs.go_version }}
- name: Build
Expand All @@ -67,10 +67,10 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ needs.start.outputs.sha }}
- uses: actions/setup-go@v3
- uses: actions/setup-go@v5
with:
go-version: ${{ needs.start.outputs.go_version }}
- name: Build
Expand Down Expand Up @@ -99,10 +99,10 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ needs.start.outputs.sha }}
- uses: actions/setup-go@v3
- uses: actions/setup-go@v5
with:
go-version: ${{ needs.start.outputs.go_version }}
- name: Download Piper binary
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/markdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
runs-on: ubuntu-latest
name: 'Format'
steps:
- uses: styfle/cancel-workflow-action@0.10.0
- uses: actions/checkout@v2
- uses: styfle/cancel-workflow-action@0.11.0
- uses: actions/checkout@v4
- name: Markdown Linting
uses: nosborn/github-action-markdown-cli@v1.1.1
uses: nosborn/github-action-markdown-cli@v3.3.0
with:
files: .
13 changes: 6 additions & 7 deletions .github/workflows/release-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,29 @@ jobs:
name: Publish
runs-on: ubuntu-latest
steps:
- uses: styfle/cancel-workflow-action@0.10.0
- uses: actions/checkout@v1
- uses: styfle/cancel-workflow-action@0.11.0
- uses: actions/checkout@v4
# Workaround for https://github.com/SAP/jenkins-library/issues/1723, build only works with jdk8 currently
- uses: actions/setup-java@v1
- uses: actions/setup-java@v4
with:
java-version: '8'
java-version: 8
distribution: zulu
- name: Prepare Release
run: |
curl --insecure --silent --location --write-out '%{http_code}' --output ./piper_master https://github.com/SAP/jenkins-library/releases/latest/download/piper_master
curl --insecure --silent --location --write-out '%{http_code}' --output ./piper_master-darwin.x86_64 https://github.com/SAP/jenkins-library/releases/latest/download/piper_master-darwin.x86_64
curl --insecure --silent --location --write-out '%{http_code}' --output ./piper_master-darwin.arm64 https://github.com/SAP/jenkins-library/releases/latest/download/piper_master-darwin.arm64
curl --insecure --silent --location --write-out '%{http_code}' --output ./piper_master-win.x86_64.exe https://github.com/SAP/jenkins-library/releases/latest/download/piper_master-win.x86_64.exe
cp ./piper_master ./piper
cp ./piper_master-darwin.x86_64 ./piper-darwin.x86_64
cp ./piper_master-darwin.arm64 ./piper-darwin.arm64
cp ./piper_master-win.x86_64.exe ./piper-win.x86_64.exe
npm install semver --quiet
echo "PIPER_version=v$(node_modules/.bin/semver -i minor $(curl --silent "https://api.github.com/repos/$GITHUB_REPOSITORY/releases/latest" | jq -r .tag_name))" >> $GITHUB_ENV
- uses: SAP/project-piper-action@master
name: 'publish Linux master binary'
with:
piper-version: master
command: githubPublishRelease
flags: --token ${{ secrets.GITHUB_TOKEN }} --assetPathList ./piper_master --assetPathList ./piper --assetPathList ./piper_master-darwin.x86_64 --assetPathList ./piper-darwin.x86_64 --assetPathList ./piper_master-darwin.arm64 --assetPathList ./piper-darwin.arm64 --assetPathList ./piper_master-win.x86_64.exe --assetPathList ./piper-win.x86_64.exe
flags: --token ${{ secrets.GITHUB_TOKEN }} --assetPathList ./piper_master --assetPathList ./piper --assetPathList ./piper_master-darwin.x86_64 --assetPathList ./piper-darwin.x86_64 --assetPathList ./piper_master-darwin.arm64 --assetPathList ./piper-darwin.arm64
- name: Build and publish jar for consumption in unit tests
run: mvn package
- uses: SAP/project-piper-action@master
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: styfle/cancel-workflow-action@0.10.0
- uses: actions/stale@v4
- uses: styfle/cancel-workflow-action@0.11.0
- uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'Thank you for your contribution! This issue is stale because it has been open 60 days with no activity. In order to keep it open, please remove stale label or add a comment within the next 10 days. If you need a Piper team member to remove the stale label make sure to add `@SAP/jenkins-library-team` to your comment.'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/update-go-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: styfle/cancel-workflow-action@0.10.0
- uses: actions/checkout@v2
- uses: actions/setup-go@v1
- uses: styfle/cancel-workflow-action@0.11.0
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.18.x'
go-version: '1.21.x'
- name: Perform update
run: |
git checkout -B gh-action-update-golang-dependencies
Expand Down
24 changes: 4 additions & 20 deletions .github/workflows/upload-go-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: styfle/cancel-workflow-action@0.10.0
- uses: actions/checkout@v1
- uses: actions/setup-go@v1
- uses: styfle/cancel-workflow-action@0.11.0
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.18.x'
go-version: '1.21.x'
- env:
CGO_ENABLED: 0
run: |
Expand Down Expand Up @@ -61,19 +61,3 @@ jobs:
piper-version: master
command: githubPublishRelease
flags: --token ${{ secrets.GITHUB_TOKEN }} --version latest --assetPath ./piper_master-darwin.arm64
- env:
CGO_ENABLED: 0
GOOS: windows
GOARCH: amd64
run: |
# See https://golang.org/cmd/link/ for info on -w (omit the DWARF symbol table) and -s (omit the symbol table and debug information)
# We use those flags to get a smaller compiled binary for faster downloads.
go build -ldflags "-w -s -X github.com/SAP/jenkins-library/cmd.GitCommit=${GITHUB_SHA} \
-X github.com/SAP/jenkins-library/pkg/log.LibraryRepository=${GITHUB_REPOSITORY} \
-X github.com/SAP/jenkins-library/pkg/telemetry.LibraryRepository=https://github.com/${GITHUB_REPOSITORY}.git" \
-o piper_master-win.x86_64.exe .
- uses: SAP/project-piper-action@master
with:
piper-version: master
command: githubPublishRelease
flags: --token ${{ secrets.GITHUB_TOKEN }} --version latest --assetPath ./piper_master-win.x86_64.exe
Loading

0 comments on commit e1ff1bb

Please sign in to comment.