Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into improveLog
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielMieg committed Jul 6, 2023
2 parents 6a9574a + 610e212 commit ce1bcc7
Show file tree
Hide file tree
Showing 41 changed files with 1,112 additions and 261 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/consumer-tests-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ jobs:
with:
repository: ${{ steps.repository.outputs.repository }}
ref: ${{ steps.branch_name.outputs.branch_name }}
- uses: actions/setup-java@v1
- uses: actions/setup-java@v3
with:
java-version: 11
distribution: zulu
- name: Install Groovy
run: |
sudo apt-get update
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/consumer-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ jobs:
steps:
- uses: styfle/[email protected]
- uses: actions/checkout@v3
- uses: actions/setup-java@v1
- uses: actions/setup-java@v3
with:
java-version: 11
distribution: zulu
- name: Install Groovy
run: |
sudo apt-get update
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,30 @@ jobs:
steps:
- uses: styfle/[email protected]

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

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

- uses: actions/setup-go@v1
- uses: actions/setup-go@v4
with:
go-version: '1.18.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
6 changes: 3 additions & 3 deletions .github/workflows/integration-tests-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: ${{ needs.start.outputs.sha }}
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ needs.start.outputs.go_version }}
- name: Build
Expand All @@ -98,7 +98,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: ${{ needs.start.outputs.sha }}
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ needs.start.outputs.go_version }}
- name: Build
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: ${{ needs.start.outputs.sha }}
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ needs.start.outputs.go_version }}
- name: Download Piper binary
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: ${{ needs.start.outputs.sha }}
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ needs.start.outputs.go_version }}
- name: Build
Expand All @@ -70,7 +70,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: ${{ needs.start.outputs.sha }}
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ needs.start.outputs.go_version }}
- name: Build
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: ${{ needs.start.outputs.sha }}
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ needs.start.outputs.go_version }}
- name: Download Piper binary
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/markdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
name: 'Format'
steps:
- uses: styfle/[email protected]
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Markdown Linting
uses: nosborn/[email protected]
with:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/release-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: styfle/[email protected]
- uses: actions/checkout@v1
- uses: actions/checkout@v3
# 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@v3
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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: styfle/[email protected]
- uses: actions/stale@v4
- uses: actions/stale@v8
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
4 changes: 2 additions & 2 deletions .github/workflows/update-go-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: styfle/[email protected]
- uses: actions/checkout@v2
- uses: actions/setup-go@v1
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: '1.18.x'
- name: Perform update
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/upload-go-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: styfle/[email protected]
- uses: actions/checkout@v1
- uses: actions/setup-go@v1
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: '1.18.x'
- env:
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/verify-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: styfle/[email protected]
- uses: actions/setup-go@v1
- uses: actions/setup-go@v4
with:
go-version: '1.18.x'
- name: Cache Golang Packages
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-golang-${{ hashFiles('go.sum') }}
restore-keys: |
${{ runner.os }}-golang-
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: unit-test
uses: paambaati/codeclimate-action@v4
env:
Expand All @@ -37,32 +37,32 @@ jobs:
format:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v1
- uses: actions/setup-go@v4
with:
go-version: '1.18.x'
- name: Cache Golang Packages
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-golang-format${{ hashFiles('go.sum') }}
restore-keys: |
${{ runner.os }}-golang-format
${{ runner.os }}-golang-
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: format
run: go fmt ./...
- name: verify
run: git diff --exit-code
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v1
- uses: actions/setup-go@v4
with:
go-version: '1.19.x'
# action requires [email protected]
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 1
- name: staticcheck
Expand All @@ -73,39 +73,39 @@ jobs:
generate:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v1
- uses: actions/setup-go@v4
with:
go-version: '1.18.x'
- name: Cache Golang Packages
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-golang-generate${{ hashFiles('go.sum') }}
restore-keys: |
${{ runner.os }}-golang-generate
${{ runner.os }}-golang-
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: generate
run: go run pkg/generator/step-metadata.go
- name: verify
run: git diff --exit-code
dependencies:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v1
- uses: actions/setup-go@v4
with:
go-version: '1.18.x'
- name: Cache Golang Packages
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-golang-dependencies${{ hashFiles('go.sum') }}
restore-keys: |
${{ runner.os }}-golang-dependencies
${{ runner.os }}-golang-
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: cleanup dependencies
run: go mod tidy
- name: verify
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/verify-groovy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@ jobs:
steps:
- uses: styfle/[email protected]

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

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

- name: Cache Maven Packages
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify-yaml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: styfle/[email protected]
- uses: actions/checkout@master

- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: 3.8

Expand Down
Loading

0 comments on commit ce1bcc7

Please sign in to comment.