Skip to content

Commit 6e04dc9

Browse files
aaron-steinfeldaaron-steinfeld
authored
Update publish (#49)
* ci: update publish * ci: remove ci codeowners * ci: change targets
1 parent 2b0b75f commit 6e04dc9

File tree

14 files changed

+98
-140
lines changed

14 files changed

+98
-140
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
# Each line is a file pattern followed by one or more owners.
22

33
# global
4-
* @hypertrace/trace-pipeline-owners
5-
6-
# GH action
7-
.github/ @aaron-steinfeld @jbahire @kotharironak
4+
* @hypertrace/trace-pipeline-owners

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,19 @@ jobs:
2626

2727
steps:
2828
- name: Checkout repository
29-
uses: actions/checkout@v3
30-
31-
- name: create checksum file
32-
uses: hypertrace/github-actions/checksum@main
33-
34-
- name: create checksum file
35-
uses: hypertrace/github-actions/checksum@main
36-
37-
- name: Cache packages
38-
uses: actions/cache@v2
29+
uses: actions/checkout@v4
3930
with:
40-
path: ~/.gradle
41-
key: gradle-packages-${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/checksum.txt') }}
42-
restore-keys: |
43-
gradle-packages-${{ runner.os }}-${{ github.job }}
44-
gradle-packages-${{ runner.os }}
31+
fetch-depth: 0
4532

4633
# Initializes the CodeQL tools for scanning.
4734
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@v2
35+
uses: github/codeql-action/init@v3
4936
with:
5037
languages: ${{ matrix.language }}
5138

5239
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5340
- name: Autobuild
54-
uses: github/codeql-action/autobuild@v2
41+
uses: github/codeql-action/autobuild@v3
5542

5643
- name: Perform CodeQL Analysis
57-
uses: github/codeql-action/analyze@v2
44+
uses: github/codeql-action/analyze@v3

‎.github/workflows/pr-build.yml‎

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,53 +3,21 @@ on:
33
push:
44
branches:
55
- main
6-
pull_request_target:
6+
pull_request:
77
branches:
88
- main
99

1010
jobs:
1111
build:
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313
steps:
1414
# Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
1515
- name: Check out code
16-
uses: actions/checkout@v2.3.4
16+
uses: actions/checkout@v4
1717
with:
18-
ref: ${{github.event.pull_request.head.ref}}
19-
repository: ${{github.event.pull_request.head.repo.full_name}}
2018
fetch-depth: 0
21-
22-
- name: create checksum file
23-
uses: hypertrace/github-actions/checksum@main
24-
25-
- name: Cache packages
26-
id: cache-packages
27-
uses: actions/cache@v2
28-
with:
29-
path: ~/.gradle
30-
key: gradle-packages-${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/checksum.txt') }}
31-
restore-keys: |
32-
gradle-packages-${{ runner.os }}-${{ github.job }}
33-
gradle-packages-${{ runner.os }}
3419

3520
- name: Build with Gradle
3621
uses: hypertrace/github-actions/gradle@main
3722
with:
38-
args: build
39-
40-
snyk-scan:
41-
runs-on: ubuntu-20.04
42-
steps:
43-
# Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
44-
- name: Check out code
45-
uses: actions/[email protected]
46-
with:
47-
ref: ${{github.event.pull_request.head.ref}}
48-
repository: ${{github.event.pull_request.head.repo.full_name}}
49-
fetch-depth: 0
50-
- name: Setup snyk
51-
uses: snyk/actions/[email protected]
52-
- name: Snyk test
53-
run: snyk test --all-sub-projects --org=hypertrace --severity-threshold=low --policy-path=.snyk --configuration-matching='^runtimeClasspath$' --remote-repo-url='${{ github.server_url }}/${{ github.repository }}.git'
54-
env:
55-
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
23+
args: build -x avroCompatibility

‎.github/workflows/pr-test.yml‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,21 @@ on:
77

88
jobs:
99
test:
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-22.04
1111
steps:
1212
# Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
1313
- name: Check out code
14-
uses: actions/checkout@v2.3.4
14+
uses: actions/checkout@v4
1515
with:
1616
fetch-depth: 0
17-
18-
- name: create checksum file
19-
uses: hypertrace/github-actions/checksum@main
20-
21-
- name: Cache packages
22-
id: cache-packages
23-
uses: actions/cache@v2
24-
with:
25-
path: ~/.gradle
26-
key: gradle-packages-${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/checksum.txt') }}
27-
restore-keys: |
28-
gradle-packages-${{ runner.os }}-${{ github.job }}
29-
gradle-packages-${{ runner.os }}
3017

3118
- name: Unit test
3219
uses: hypertrace/github-actions/gradle@main
3320
with:
3421
args: jacocoTestReport
3522

3623
- name: Upload coverage to Codecov
37-
uses: codecov/codecov-action@v2
24+
uses: codecov/codecov-action@v5
3825
with:
3926
name: unit test reports
4027
flags: unit
@@ -45,14 +32,14 @@ jobs:
4532
args: copyAllReports --output-dir=/tmp/test-reports
4633

4734
- name: Archive test reports
48-
uses: actions/upload-artifact@v1
35+
uses: actions/upload-artifact@v4
4936
with:
5037
name: test-reports
5138
path: /tmp/test-reports
5239
if: always()
5340

5441
- name: Publish Unit Test Results
55-
uses: docker://ghcr.io/enricomi/publish-unit-test-result-action:v1.6
42+
uses: docker://ghcr.io/enricomi/publish-unit-test-result-action:v2
5643
continue-on-error: true
5744
if: always()
5845
with:

‎.github/workflows/publish.yml‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,24 @@ on:
44
release:
55
types:
66
- created
7-
workflow_dispatch:
87

98
jobs:
109
publish-artifacts:
1110
runs-on: ubuntu-20.04
1211
steps:
1312
# Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
1413
- name: Check out code
15-
uses: actions/checkout@v2.3.4
14+
uses: actions/checkout@v4
1615
with:
1716
fetch-depth: 0
1817

19-
- name: create checksum file
20-
uses: hypertrace/github-actions/checksum@main
21-
22-
- name: Cache packages
23-
uses: actions/cache@v2
24-
with:
25-
path: ~/.gradle
26-
key: gradle-packages-${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/checksum.txt') }}
27-
restore-keys: |
28-
gradle-packages-${{ runner.os }}-${{ github.job }}
29-
gradle-packages-${{ runner.os }}
30-
3118
- name: publish java artifacts
3219
uses: hypertrace/github-actions/gradle@main
3320
with:
3421
args: publish -x avroCompatibility
3522
env:
36-
ORG_GRADLE_PROJECT_artifactory_contextUrl: ${{ secrets.ARTIFACTORY_CONTEXT_URL }}
37-
ORG_GRADLE_PROJECT_artifactory_user: ${{ secrets.ARTIFACTORY_PUBLISH_USER }}
38-
ORG_GRADLE_PROJECT_artifactory_password: ${{ secrets.ARTIFACTORY_PUBLISH_TOKEN }}
23+
ORG_GRADLE_PROJECT_maven_repo_url: ${{ secrets.HAR_REPO_URL }}
24+
ORG_GRADLE_PROJECT_maven_user: ${{ secrets.HAR_PUBLISH_USER }}
25+
ORG_GRADLE_PROJECT_maven_password: ${{ secrets.HAR_PUBLISH_TOKEN }}
3926

4027

‎build.gradle.kts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import org.hypertrace.gradle.publishing.HypertracePublishExtension
22
import org.hypertrace.gradle.publishing.License
33

44
plugins {
5-
id("org.hypertrace.repository-plugin") version "0.4.0"
6-
id("org.hypertrace.code-style-plugin") version "1.1.1" apply false
7-
id("org.hypertrace.ci-utils-plugin") version "0.3.0"
8-
id("org.hypertrace.publish-plugin") version "1.0.2" apply false
9-
id("org.hypertrace.jacoco-report-plugin") version "0.2.0" apply false
5+
id("org.hypertrace.repository-plugin") version "0.5.0"
6+
id("org.hypertrace.code-style-plugin") version "2.2.0" apply false
7+
id("org.hypertrace.ci-utils-plugin") version "0.4.0"
8+
id("org.hypertrace.publish-plugin") version "1.1.1" apply false
9+
id("org.hypertrace.jacoco-report-plugin") version "0.3.0" apply false
1010
}
1111

1212
subprojects {

‎data-model/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
plugins {
22
`java-library`
33
jacoco
4-
id("org.hypertrace.avro-plugin") version "0.3.1"
4+
id("org.hypertrace.avro-plugin") version "0.5.1"
55
id("org.hypertrace.publish-plugin")
66
id("org.hypertrace.jacoco-report-plugin")
7-
id("org.owasp.dependencycheck") version "8.2.1"
7+
id("org.owasp.dependencycheck") version "12.1.0"
88
}
99

1010
tasks.test {

‎data-model/src/main/java/org/hypertrace/core/datamodel/shared/TraceEntitiesGraph.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ public class TraceEntitiesGraph {
3030
processEntities(trace);
3131
}
3232

33-
/** @return an immutable set containing the root entities */
33+
/**
34+
* @return an immutable set containing the root entities
35+
*/
3436
public Set<Entity> getRootEntities() {
3537
return rootEntities;
3638
}
@@ -43,7 +45,9 @@ public List<Entity> getChildrenEntities(Entity entity) {
4345
return parentToChildrenEntities.get(entity.getEntityId());
4446
}
4547

46-
/** @return an immutable map of entity ids to entities */
48+
/**
49+
* @return an immutable map of entity ids to entities
50+
*/
4751
public Map<String, Entity> getEntityMap() {
4852
return entityMap;
4953
}

‎data-model/src/main/java/org/hypertrace/core/datamodel/shared/TraceEventsGraph.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ public class TraceEventsGraph {
3333
processEvents(trace);
3434
}
3535

36-
/** @return an immutable set containing the root events */
36+
/**
37+
* @return an immutable set containing the root events
38+
*/
3739
public Set<Event> getRootEvents() {
3840
return rootEvents;
3941
}
@@ -79,7 +81,9 @@ private void processEvents(StructuredTrace trace) {
7981
}
8082
}
8183

82-
/** @return an immutable map of event ids to events */
84+
/**
85+
* @return an immutable map of event ids to events
86+
*/
8387
public Map<ByteBuffer, Event> getEventMap() {
8488
return eventMap;
8589
}

‎gradle/wrapper/gradle-wrapper.jar‎

-15.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)