Skip to content

Commit 53529a7

Browse files
lesnerddavidlesfrog
lesnerd
authored and
davidlesfrog
committed
Merge branch 'jfrog:dev' into dev
2 parents 7ca715f + ce3aadc commit 53529a7

File tree

85 files changed

+1834
-2496
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1834
-2496
lines changed

‎.github/workflows/accessTests.yml‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,18 @@ jobs:
2222
os: [ ubuntu, windows, macos ]
2323
runs-on: ${{ matrix.os }}-latest
2424
steps:
25-
- name: Setup Go
26-
uses: actions/setup-go@v5
27-
with:
28-
go-version: 1.22.x
29-
cache: false
30-
- name: Go Cache
31-
uses: actions/cache@v4
32-
with:
33-
path: ~/go/pkg/mod
34-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
35-
restore-keys: ${{ runner.os }}-go-
3625
- name: Checkout code
3726
uses: actions/checkout@v4
3827
with:
3928
ref: ${{ github.event.pull_request.head.sha }}
29+
30+
- name: Setup Go with cache
31+
uses: jfrog/.github/actions/install-go-with-cache@main
32+
33+
- name: Install local Artifactory
34+
uses: jfrog/.github/actions/install-local-artifactory@main
35+
with:
36+
RTLIC: ${{ secrets.RTLIC }}
37+
4038
- name: Run Access tests
41-
run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.access --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --jfrog.user=${{ secrets.PLATFORM_USER }} --ci.runId=${{ runner.os }}-access
39+
run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.access --jfrog.url=http://127.0.0.1:8082 --jfrog.adminToken=${{ env.JFROG_TESTS_LOCAL_ACCESS_TOKEN }}

‎.github/workflows/addReleaseLinks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Check out repository
12-
uses: actions/checkout@v2
12+
uses: actions/checkout@v4
1313

1414
- name: Create markdown download links
1515
run: |

‎.github/workflows/analysis.yml‎

Lines changed: 16 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,14 @@ jobs:
1818
os: [ ubuntu, windows, macos ]
1919
runs-on: ${{ matrix.os }}-latest
2020
steps:
21-
- name: Setup Go
22-
uses: actions/setup-go@v5
23-
with:
24-
go-version: 1.22.x
25-
cache: false
2621
- name: Checkout code
2722
uses: actions/checkout@v4
2823
with:
2924
ref: ${{ github.event.pull_request.head.sha }}
30-
- name: Go Cache
31-
uses: actions/cache@v4
32-
with:
33-
path: ~/go/pkg/mod
34-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
35-
restore-keys: ${{ runner.os }}-go-
25+
26+
- name: Setup Go with cache
27+
uses: jfrog/.github/actions/install-go-with-cache@main
28+
3629
- name: Run Go vet
3730
run: go vet -v ./...
3831

@@ -42,32 +35,25 @@ jobs:
4235
steps:
4336
- name: Checkout Source
4437
uses: actions/checkout@v4
45-
- name: Setup Go
46-
uses: actions/setup-go@v5
47-
with:
48-
go-version: 1.22.x
49-
cache: false
50-
- name: Static Code Analysis
51-
uses: golangci/golangci-lint-action@v4
52-
with:
53-
args: |
54-
--timeout 5m --out-${NO_FUTURE}format colored-line-number --enable errcheck,gosimple,govet,ineffassign,staticcheck,typecheck,unused,gocritic,asasalint,asciicheck,errchkjson,exportloopref,forcetypeassert,makezero,nilerr,unparam,unconvert,wastedassign,usestdlibvars
5538

39+
- name: Setup Go with cache
40+
uses: jfrog/.github/actions/install-go-with-cache@main
41+
42+
- name: Run golangci linter
43+
uses: jfrog/.github/actions/golangci-lint@main
44+
5645
Go-Sec:
5746
name: Go-Sec ubuntu-latest
5847
runs-on: ubuntu-latest
5948
steps:
6049
- name: Checkout Source
6150
uses: actions/checkout@v4
62-
- name: Setup Go
63-
uses: actions/setup-go@v5
64-
with:
65-
go-version: 1.22.x
66-
cache: false
67-
- name: Run Gosec Security Scanner
68-
uses: securego/gosec@master
69-
with:
70-
args: -exclude G204,G301,G302,G304,G306 -tests -exclude-dir \.*test\.* ./...
51+
52+
- name: Setup Go with cache
53+
uses: jfrog/.github/actions/install-go-with-cache@main
54+
55+
- name: Run Go-Sec scanner
56+
uses: jfrog/.github/actions/gosec-scanner@main
7157

7258
ShellCheck:
7359
name: Shellcheck

‎.github/workflows/artifactoryTests.yml‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,31 +23,21 @@ jobs:
2323
os: [ ubuntu, windows, macos ]
2424
runs-on: ${{ matrix.os }}-latest
2525
steps:
26-
- name: Setup Go
27-
uses: actions/setup-go@v5
28-
with:
29-
go-version: 1.22.x
30-
cache: false
3126
- name: Checkout code
3227
uses: actions/checkout@v4
3328
with:
3429
ref: ${{ github.event.pull_request.head.sha }}
35-
- name: Go Cache
36-
uses: actions/cache@v4
30+
31+
- name: Setup Go with cache
32+
uses: jfrog/.github/actions/install-go-with-cache@main
33+
34+
- name: Install local Artifactory
35+
uses: jfrog/.github/actions/install-local-artifactory@main
3736
with:
38-
path: ~/go/pkg/mod
39-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
40-
restore-keys: ${{ runner.os }}-go-
41-
- name: Setup Artifactory
42-
run: |
43-
go install github.com/jfrog/jfrog-testing-infra/local-rt-setup@latest
44-
~/go/bin/local-rt-setup
45-
env:
46-
RTLIC: ${{secrets.RTLIC}}
47-
GOPROXY: direct
37+
RTLIC: ${{ secrets.RTLIC }}
4838

4939
- name: Run Artifactory tests
50-
run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.artifactory
40+
run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.artifactory --jfrog.url=http://127.0.0.1:8082 --jfrog.adminToken=${{ env.JFROG_TESTS_LOCAL_ACCESS_TOKEN }}
5141
if: ${{ matrix.suite == 'artifactory' }}
5242

5343
- name: Run Artifactory projects tests

‎.github/workflows/cla.yml‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,14 @@ on:
55
types: [ created ]
66
pull_request_target:
77
types: [ opened, synchronize ]
8-
98
jobs:
109
CLAssistant:
1110
runs-on: ubuntu-latest
1211
steps:
13-
- uses: actions-ecosystem/action-regex-match@v2
14-
id: sign-or-recheck
12+
- name: Run CLA Check
13+
uses: jfrog/.github/actions/cla@main
1514
with:
16-
text: ${{ github.event.comment.body }}
17-
regex: '\s*(I have read the CLA Document and I hereby sign the CLA)|(recheck)\s*'
18-
19-
- name: "CLA Assistant"
20-
if: ${{ steps.sign-or-recheck.outputs.match != '' || github.event_name == 'pull_request_target' }}
21-
# Alpha Release
22-
uses: cla-assistant/[email protected]
23-
env:
24-
# Generated and maintained by GitHub
15+
event_comment_body: ${{ github.event.comment.body }}
16+
event_name: ${{ github.event_name }}
2517
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26-
# JFrog organization secret
27-
PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_SIGN_TOKEN }}
28-
with:
29-
path-to-signatures: "signed_clas.json"
30-
path-to-document: "https://jfrog.com/cla/"
31-
remote-organization-name: "jfrog"
32-
remote-repository-name: "jfrog-signed-clas"
33-
# branch should not be protected
34-
branch: "master"
35-
allowlist: bot*
18+
CLA_SIGN_TOKEN: ${{ secrets.CLA_SIGN_TOKEN }}

‎.github/workflows/distributionTests.yml‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,13 @@ jobs:
2222
os: [ ubuntu, windows, macos ]
2323
runs-on: ${{ matrix.os }}-latest
2424
steps:
25-
- name: Setup Go
26-
uses: actions/setup-go@v5
27-
with:
28-
go-version: 1.22.x
29-
cache: false
30-
- name: Go Cache
31-
uses: actions/cache@v4
32-
with:
33-
path: ~/go/pkg/mod
34-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
35-
restore-keys: ${{ runner.os }}-go-
25+
- name: Setup Go with cache
26+
uses: jfrog/.github/actions/install-go-with-cache@main
27+
3628
- name: Checkout code
3729
uses: actions/checkout@v4
3830
with:
3931
ref: ${{ github.event.pull_request.head.sha }}
32+
4033
- name: Run Distribution tests
4134
run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.distribution --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --jfrog.user=${{ secrets.PLATFORM_USER }} --ci.runId=${{ runner.os }}-distribution

‎.github/workflows/dockerTests.yml‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,29 @@ jobs:
1818
name: ubuntu-latest
1919
runs-on: ubuntu-latest
2020
steps:
21-
- name: Setup Go
22-
uses: actions/setup-go@v5
23-
with:
24-
go-version: 1.22.x
25-
cache: false
2621
- name: Checkout code
2722
uses: actions/checkout@v4
2823
with:
2924
ref: ${{ github.event.pull_request.head.sha }}
30-
- name: Go Cache
31-
uses: actions/cache@v4
32-
with:
33-
path: ~/go/pkg/mod
34-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
35-
restore-keys: ${{ runner.os }}-go-
25+
26+
- name: Setup Go with cache
27+
uses: jfrog/.github/actions/install-go-with-cache@main
28+
3629
- name: Containerize Artifactory
3730
run: |
3831
cd ./testdata/docker/artifactory/
3932
./start.sh
4033
env:
4134
RTLIC: ${{secrets.RTLIC}}
4235
GOPROXY: direct
36+
4337
- name: Wait for Artifactory to finish loading
4438
uses: nev7n/wait_for_response@v1
4539
with:
4640
url: "http://localhost:8082"
4741
responseCode: 200
4842
timeout: 600000
4943
interval: 500
44+
5045
- name: Run Docker tests
5146
run: go test -v -timeout 0 --test.docker

‎.github/workflows/frogbot-scan-pull-request.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@ jobs:
1212
# "frogbot" GitHub environment can approve the pull request to be scanned.
1313
environment: frogbot
1414
steps:
15-
- name: Setup Go
16-
uses: actions/setup-go@v5
17-
with:
18-
go-version: 1.22.x
19-
cache: false
15+
- name: Setup Go with cache
16+
uses: jfrog/.github/actions/install-go-with-cache@main
17+
2018
- uses: jfrog/frogbot@v2
2119
env:
2220
JFROG_CLI_LOG_LEVEL: "DEBUG"

‎.github/workflows/frogbot-scan-repository.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@ jobs:
1717
# The repository scanning will be triggered periodically on the following branches.
1818
branch: [ "dev" ]
1919
steps:
20-
- name: Setup Go
21-
uses: actions/setup-go@v5
22-
with:
23-
go-version: 1.22.x
24-
cache: false
20+
- name: Setup Go with cache
21+
uses: jfrog/.github/actions/install-go-with-cache@main
22+
2523
- uses: jfrog/frogbot@v2
2624
env:
2725
JFROG_CLI_LOG_LEVEL: "DEBUG"

‎.github/workflows/goTests.yml‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,13 @@ jobs:
2323
os: [ ubuntu, windows, macos ]
2424
runs-on: ${{ matrix.os }}-latest
2525
steps:
26-
- name: Setup Go
27-
uses: actions/setup-go@v5
28-
with:
29-
go-version: 1.22.x
30-
cache: false
3126
- name: Checkout code
3227
uses: actions/checkout@v4
3328
with:
3429
ref: ${{ github.event.pull_request.head.sha }}
35-
- name: Go Cache
36-
uses: actions/cache@v4
37-
with:
38-
path: ~/go/pkg/mod
39-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
40-
restore-keys: ${{ runner.os }}-go-
30+
31+
- name: Setup Go with cache
32+
uses: jfrog/.github/actions/install-go-with-cache@main
33+
4134
- name: Run Go tests
4235
run: go test -v -timeout 0 --test.go --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --ci.runId=${{ runner.os }}-go

0 commit comments

Comments
 (0)