Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/upstream_merge_v1.14.8' into lma…
Browse files Browse the repository at this point in the history
…rtins/upstream_merge_v1.14.10
  • Loading branch information
lucca30 committed Feb 11, 2025
2 parents 13d6ac9 + fc1d1fb commit 0873515
Show file tree
Hide file tree
Showing 49 changed files with 1,582 additions and 1,087 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- uses: actions/setup-go@v5
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Install dependencies on Linux
if: runner.os == 'Linux'
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
- uses: actions/setup-go@v5
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Install dependencies on Linux
if: runner.os == 'Linux'
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
- uses: actions/setup-go@v5
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Install dependencies on Linux
if: runner.os == 'Linux'
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
- uses: actions/setup-go@v5
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Install dependencies on Linux
if: runner.os == 'Linux'
Expand Down Expand Up @@ -196,7 +196,7 @@ jobs:
- uses: actions/setup-go@v5
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Checkout matic-cli
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Go
uses: actions/setup-go@v5
Expand Down
25 changes: 0 additions & 25 deletions .github/workflows/govuln.yml

This file was deleted.

23 changes: 23 additions & 0 deletions .github/workflows/govulncheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Govuln
on: [ push, pull_request ]

jobs:
govulncheck:
name: Run govulncheck
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v5
with:
go-version: "1.23.6"
check-latest: true
- uses: actions/checkout@v4
- uses: technote-space/get-diff-action@v6
with:
PATTERNS: |
**/*.go
go.mod
go.sum
Makefile
- name: govulncheck
run: make vulncheck
if: "env.GIT_DIFF != ''"
4 changes: 2 additions & 2 deletions .github/workflows/packager_deb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@master
with:
go-version: 1.22.1
go-version: 1.23.6
# Variables
- name: Adding TAG to ENV
run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
Expand Down Expand Up @@ -126,4 +126,4 @@ jobs:
prerelease: true
files: |
packaging/deb/bor**.deb
packaging/deb/bor**.deb.checksum
packaging/deb/bor**.deb.checksum
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Go
uses: actions/setup-go@master
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Prepare
id: prepare
Expand Down
325 changes: 0 additions & 325 deletions .github/workflows/rpm_amoy_profile_packager.yml

This file was deleted.

95 changes: 0 additions & 95 deletions .github/workflows/rpm_arm_packager.yml

This file was deleted.

Loading

0 comments on commit 0873515

Please sign in to comment.