Skip to content

Commit

Permalink
Merge branch 'master' into HSPIPER-438/x-crypto-vuln-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
bitmaskit authored Jan 23, 2025
2 parents ed3d8b0 + dff1749 commit 3d61dda
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 16 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/integration-tests-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o piper -tags release
- name: Upload Piper binary
if: success()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: piper
path: piper
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
echo "matrix=$(go run .github/workflows/parse_integration_test_list.go -file ./integration/github_actions_integration_test_list.yml)" >> "$GITHUB_OUTPUT"
- name: Upload integration tests binary
if: success()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: integration_tests
path: integration_tests
Expand All @@ -134,11 +134,11 @@ jobs:
with:
go-version: ${{ needs.start.outputs.go_version }}
- name: Download Piper binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: piper
- name: Download integration tests binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: integration_tests
path: ./integration/
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o piper -tags release
- name: Upload Piper binary
if: success()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: piper
path: piper
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
echo "matrix=$(go run .github/workflows/parse_integration_test_list.go -file ./integration/github_actions_integration_test_list.yml)" >> "$GITHUB_OUTPUT"
- name: Upload integration tests binary
if: success()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: integration_tests
path: integration_tests
Expand All @@ -106,11 +106,11 @@ jobs:
with:
go-version: ${{ needs.start.outputs.go_version }}
- name: Download Piper binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: piper
- name: Download integration tests binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: integration_tests
path: ./integration/
Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
# **_Important:_** **_This project is no longer accepting contributions. We appreciate all the past contributions and support from the community._**

[![Maintainability](https://api.codeclimate.com/v1/badges/0e6a23344616e29b4ed0/maintainability)](https://codeclimate.com/github/SAP/jenkins-library/maintainability)
[![Test Coverage](https://api.codeclimate.com/v1/badges/0e6a23344616e29b4ed0/test_coverage)](https://codeclimate.com/github/SAP/jenkins-library/test_coverage)
[![Go Report Card](https://goreportcard.com/badge/github.com/SAP/jenkins-library)](https://goreportcard.com/report/github.com/SAP/jenkins-library)
[![REUSE status](https://api.reuse.software/badge/github.com/SAP/jenkins-library)](https://api.reuse.software/info/github.com/SAP/jenkins-library)

# Project Piper Repository
## Project Piper Repository

The Project "Piper" offers default pipelines to easily implement CI/CD processes integrating SAP systems. The corresponding "Shared Library" provides a set of "steps" to build your own scenarios beyond defaults.

# User Documentation
## User Documentation

If you want to view the User Documentation of Project Piper please follow this [Piper Pages Link][piper-library-user-doc].

# Known Issues
## Known Issues

A list of known issues is available on the [GitHub issues page of this project][piper-library-issues].

# How to obtain support
## How to obtain support

Feel free to open new issues for feature requests, bugs or general feedback on
the [GitHub issues page of this project][piper-library-issues].

Register to our [google group][google-group] in order to get updates or for asking questions.

# Contributing
## Contributing

Read and understand our [contribution guidelines][piper-library-contribution]
before opening a pull request.
Expand Down
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ module github.com/SAP/jenkins-library

go 1.23.4

replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16

require (
cloud.google.com/go/pubsub v1.45.3
cloud.google.com/go/storage v1.50.0
Expand Down
2 changes: 1 addition & 1 deletion pkg/codeql/github_repo_upload.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/go-git/go-git/v5/plumbing/transport"
"github.com/go-git/go-git/v5/plumbing/transport/http"
"github.com/go-git/go-git/v5/storage/memory"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

type GitUploader interface {
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubernetes/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/SAP/jenkins-library/pkg/command"
piperhttp "github.com/SAP/jenkins-library/pkg/http"
"github.com/SAP/jenkins-library/pkg/piperutils"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/SAP/jenkins-library/pkg/log"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/yaml/yamlUtil.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"github.com/SAP/jenkins-library/pkg/log"
"github.com/SAP/jenkins-library/pkg/piperutils"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
"io"
"os"
"reflect"
Expand Down

0 comments on commit 3d61dda

Please # to comment.