Skip to content

Commit 6982553

Browse files
agrasthagrasth
authored
Merge branch 'master' into master
2 parents f566f14 + e5c4b62 commit 6982553

Some content is hidden

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

64 files changed

+3306
-1856
lines changed

‎.github/workflows/accessTests.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ jobs:
4545
with:
4646
ref: ${{ github.event.pull_request.head.sha || github.ref }}
4747

48+
- name: Setup FastCI
49+
if: matrix.os.name != 'macos'
50+
uses: jfrog-fastci/fastci@v0
51+
with:
52+
github_token: ${{ secrets.GITHUB_TOKEN }}
53+
fastci_otel_token: ${{ secrets.FASTCI_TOKEN }}
54+
4855
- name: Setup Go with cache
4956
if: matrix.os.name != 'macos'
5057
uses: jfrog/.github/actions/install-go-with-cache@main

‎.github/workflows/analysis.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ jobs:
2121
with:
2222
ref: ${{ github.event.pull_request.head.sha || github.ref }}
2323

24+
- name: Setup FastCI
25+
uses: jfrog-fastci/fastci@v0
26+
with:
27+
github_token: ${{ secrets.GITHUB_TOKEN }}
28+
fastci_otel_token: ${{ secrets.FASTCI_TOKEN }}
29+
2430
- name: Setup Go with cache
2531
uses: jfrog/.github/actions/install-go-with-cache@main
2632

@@ -36,6 +42,12 @@ jobs:
3642
with:
3743
ref: ${{ github.event.pull_request.head.sha || github.ref }}
3844

45+
- name: Setup FastCI
46+
uses: jfrog-fastci/fastci@v0
47+
with:
48+
github_token: ${{ secrets.GITHUB_TOKEN }}
49+
fastci_otel_token: ${{ secrets.FASTCI_TOKEN }}
50+
3951
- name: Setup Go with cache
4052
uses: jfrog/.github/actions/install-go-with-cache@main
4153

@@ -51,6 +63,12 @@ jobs:
5163
with:
5264
ref: ${{ github.event.pull_request.head.sha || github.ref }}
5365

66+
- name: Setup FastCI
67+
uses: jfrog-fastci/fastci@v0
68+
with:
69+
github_token: ${{ secrets.GITHUB_TOKEN }}
70+
fastci_otel_token: ${{ secrets.FASTCI_TOKEN }}
71+
5472
- name: Setup Go with cache
5573
uses: jfrog/.github/actions/install-go-with-cache@main
5674

@@ -66,6 +84,12 @@ jobs:
6684
with:
6785
ref: ${{ github.event.pull_request.head.sha || github.ref }}
6886

87+
- name: Setup FastCI
88+
uses: jfrog-fastci/fastci@v0
89+
with:
90+
github_token: ${{ secrets.GITHUB_TOKEN }}
91+
fastci_otel_token: ${{ secrets.FASTCI_TOKEN }}
92+
6993
- name: Run ShellCheck
7094
uses: ludeeus/action-shellcheck@master
7195
with:
@@ -79,6 +103,12 @@ jobs:
79103
with:
80104
ref: ${{ github.event.pull_request.head.sha || github.ref }}
81105

106+
- name: Setup FastCI
107+
uses: jfrog-fastci/fastci@v0
108+
with:
109+
github_token: ${{ secrets.GITHUB_TOKEN }}
110+
fastci_otel_token: ${{ secrets.FASTCI_TOKEN }}
111+
82112
- name: Check for uncommented replace instructions on JFrog dependencies
83113
run: |
84114
if grep -E '^[[:space:]]*replace[[:space:]]+github\.com/jfrog' go.mod; then

‎.github/workflows/artifactoryTests.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ jobs:
4545
with:
4646
ref: ${{ github.event.pull_request.head.sha || github.ref }}
4747

48+
- name: Setup FastCI
49+
if: matrix.os.name != 'macos'
50+
uses: jfrog-fastci/fastci@v0
51+
with:
52+
github_token: ${{ secrets.GITHUB_TOKEN }}
53+
fastci_otel_token: ${{ secrets.FASTCI_TOKEN }}
54+
4855
- name: Setup Go with cache
4956
if: matrix.os.name != 'macos'
5057
uses: jfrog/.github/actions/install-go-with-cache@main

‎.github/workflows/conanTests.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: Conan Tests
2+
on:
3+
workflow_dispatch:
4+
push:
5+
branches:
6+
- "master"
7+
pull_request_target:
8+
types: [labeled]
9+
branches:
10+
- "master"
11+
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ github.ref }}
14+
cancel-in-progress: true
15+
jobs:
16+
Conan-Tests:
17+
name: Conan tests (${{ matrix.os.name }})
18+
if: github.event_name == 'workflow_dispatch' || github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'safe to test')
19+
strategy:
20+
fail-fast: false
21+
matrix:
22+
os:
23+
- name: ubuntu
24+
version: 24.04
25+
- name: windows
26+
version: 2022
27+
- name: macos
28+
version: 14
29+
runs-on: ${{ matrix.os.name }}-${{ matrix.os.version }}
30+
steps:
31+
- name: Skip macOS - JGC-413
32+
if: matrix.os.name == 'macos'
33+
run: |
34+
echo "::warning::JGC-413 - Skip until artifactory bootstrap in osx is fixed"
35+
exit 0
36+
37+
- name: Checkout code
38+
if: matrix.os.name != 'macos'
39+
uses: actions/checkout@v5
40+
with:
41+
ref: ${{ github.event.pull_request.head.sha || github.ref }}
42+
43+
- name: Setup FastCI
44+
if: matrix.os.name != 'macos'
45+
uses: jfrog-fastci/fastci@v0
46+
with:
47+
github_token: ${{ secrets.GITHUB_TOKEN }}
48+
fastci_otel_token: ${{ secrets.FASTCI_TOKEN }}
49+
50+
- name: Setup Go with cache
51+
if: matrix.os.name != 'macos'
52+
uses: jfrog/.github/actions/install-go-with-cache@main
53+
54+
- name: Install Conan
55+
if: matrix.os.name != 'macos'
56+
uses: turtlebrowser/get-conan@main
57+
with:
58+
version: '2.10.2'
59+
60+
- name: Install local Artifactory
61+
if: matrix.os.name != 'macos'
62+
uses: jfrog/.github/actions/install-local-artifactory@main
63+
with:
64+
RTLIC: ${{ secrets.RTLIC }}
65+
RT_CONNECTION_TIMEOUT_SECONDS: '1200'
66+
67+
- name: Run Conan tests
68+
if: matrix.os.name != 'macos'
69+
run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.conan

‎.github/workflows/distributionTests.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,11 @@ jobs:
3232
with:
3333
ref: ${{ github.event.pull_request.head.sha || github.ref }}
3434

35+
- name: Setup FastCI
36+
uses: jfrog-fastci/fastci@v0
37+
with:
38+
github_token: ${{ secrets.GITHUB_TOKEN }}
39+
fastci_otel_token: ${{ secrets.FASTCI_TOKEN }}
40+
3541
- name: Run Distribution tests
3642
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: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ jobs:
3030
with:
3131
ref: ${{ github.event.pull_request.head.sha || github.ref }}
3232

33+
- name: Setup FastCI
34+
uses: jfrog-fastci/fastci@v0
35+
with:
36+
github_token: ${{ secrets.GITHUB_TOKEN }}
37+
fastci_otel_token: ${{ secrets.FASTCI_TOKEN }}
38+
cache_enabled_optimizations: docker_build_trace_optimization
39+
3340
- name: Setup Go with cache
3441
uses: jfrog/.github/actions/install-go-with-cache@main
3542

‎.github/workflows/evidenceTests.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ jobs:
2929
with:
3030
ref: ${{ github.event.pull_request.head.sha || github.ref }}
3131

32+
- name: Setup FastCI
33+
uses: jfrog-fastci/fastci@v0
34+
with:
35+
github_token: ${{ secrets.GITHUB_TOKEN }}
36+
fastci_otel_token: ${{ secrets.FASTCI_TOKEN }}
37+
38+
3239
- name: Setup Go with cache
3340
uses: jfrog/.github/actions/install-go-with-cache@main
3441

‎.github/workflows/goTests.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ jobs:
3030
with:
3131
ref: ${{ github.event.pull_request.head.sha || github.ref }}
3232

33+
- name: Setup FastCI
34+
uses: jfrog-fastci/fastci@v0
35+
with:
36+
github_token: ${{ secrets.GITHUB_TOKEN }}
37+
fastci_otel_token: ${{ secrets.FASTCI_TOKEN }}
38+
3339
- name: Setup Go with cache
3440
uses: jfrog/.github/actions/install-go-with-cache@main
3541

‎.github/workflows/gradleTests.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ jobs:
4545
with:
4646
ref: ${{ github.event.pull_request.head.sha || github.ref }}
4747

48+
- name: Setup FastCI
49+
if: matrix.os.name != 'macos'
50+
uses: jfrog-fastci/fastci@v0
51+
with:
52+
github_token: ${{ secrets.GITHUB_TOKEN }}
53+
fastci_otel_token: ${{ secrets.FASTCI_TOKEN }}
54+
4855
- name: Setup Java
4956
if: matrix.os.name != 'macos'
5057
uses: actions/setup-java@v5

‎.github/workflows/helmTests.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ jobs:
4545
with:
4646
ref: ${{ github.event.pull_request.head.sha || github.ref }}
4747

48+
- name: Setup FastCI
49+
if: matrix.os.name != 'macos'
50+
uses: jfrog-fastci/fastci@v0
51+
with:
52+
github_token: ${{ secrets.GITHUB_TOKEN }}
53+
fastci_otel_token: ${{ secrets.FASTCI_TOKEN }}
54+
4855
- name: Setup Go with cache
4956
if: matrix.os.name != 'macos'
5057
uses: jfrog/.github/actions/install-go-with-cache@main

0 commit comments

Comments
 (0)