|
8 | 8 |
|
9 | 9 | permissions:
|
10 | 10 | id-token: write
|
11 |
| - contents: read |
| 11 | + contents: write |
12 | 12 |
|
13 | 13 | jobs:
|
| 14 | + create-release: |
| 15 | + runs-on: ubuntu-latest |
| 16 | + steps: |
| 17 | + - uses: actions/checkout@v4 |
| 18 | + - name: Create Release |
| 19 | + run: gh release create ${{ github.ref_name }} --draft --title ${{ github.ref_name }} |
| 20 | + env: |
| 21 | + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |
14 | 22 | build-layer:
|
15 | 23 | runs-on: ubuntu-latest
|
| 24 | + needs: create-release |
16 | 25 | outputs:
|
17 | 26 | JAVAAGENT_VERSION: ${{ steps.save-javaagent-version.outputs.JAVAAGENT_VERSION }}
|
| 27 | + JAVAWRAPPER_VERSION: ${{ steps.save-javawrapper-version.outputs.JAVAWRAPPER_VERSION }} |
18 | 28 | steps:
|
19 | 29 | - uses: actions/checkout@v4
|
20 | 30 |
|
|
24 | 34 | java-version: 17
|
25 | 35 |
|
26 | 36 | - name: Setup Gradle
|
27 |
| - uses: gradle/actions/setup-gradle@v3 |
28 |
| - with: |
29 |
| - validate-wrappers: true |
| 37 | + uses: gradle/actions/setup-gradle@v4 |
30 | 38 |
|
31 | 39 | - name: Execute Gradle build
|
32 | 40 | run: |
|
|
43 | 51 | name: Save javawrapper layer to build
|
44 | 52 | with:
|
45 | 53 | name: opentelemetry-javawrapper-layer.zip
|
46 |
| - path: java/layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip |
| 54 | + path: java/layer-wrapper/build/distributions/opentelemetry-javawrapper-layer.zip |
| 55 | + |
| 56 | + - name: Add Binary to Release |
| 57 | + run: | |
| 58 | + gh release upload ${{github.ref_name}} java/layer-wrapper/build/distributions/opentelemetry-javawrapper-layer.zip |
| 59 | + env: |
| 60 | + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |
47 | 61 |
|
48 | 62 | - name: Save Javaagent Version
|
49 | 63 | id: save-javaagent-version
|
|
53 | 67 | JAVAAGENT_VERSION=$(java -jar ./opentelemetry-javaagent.jar)
|
54 | 68 | echo "JAVAAGENT_VERSION=$JAVAAGENT_VERSION" >> $GITHUB_OUTPUT
|
55 | 69 |
|
| 70 | + - name: Save Java Wrapper Version |
| 71 | + id: save-javawrapper-version |
| 72 | + shell: bash |
| 73 | + run: | |
| 74 | + cd java |
| 75 | + JAVAWRAPPER_VERSION=$(./gradlew layer-wrapper:printOtelJavaInstrumentationVersion -q) |
| 76 | + echo "JAVAWRAPPER_VERSION=$JAVAWRAPPER_VERSION" >> $GITHUB_OUTPUT |
| 77 | +
|
56 | 78 | publish-javaagent-layer:
|
57 | 79 | uses: ./.github/workflows/layer-publish.yml
|
58 | 80 | needs: build-layer
|
|
80 | 102 | layer-name: opentelemetry-javaagent
|
81 | 103 | component-version: ${{needs.build-layer.outputs.JAVAAGENT_VERSION}}
|
82 | 104 | # architecture:
|
83 |
| - runtimes: java8 java8.al2 java11 java17 |
| 105 | + runtimes: java8.al2 java11 java17 |
84 | 106 | release-group: prod
|
85 | 107 | aws_region: ${{ matrix.aws_region }}
|
86 | 108 | secrets: inherit
|
@@ -108,11 +130,11 @@ jobs:
|
108 | 130 | - us-west-1
|
109 | 131 | - us-west-2
|
110 | 132 | with:
|
111 |
| - artifact-name: opentelemetry-java-wrapper.zip |
| 133 | + artifact-name: opentelemetry-javawrapper-layer.zip |
112 | 134 | layer-name: opentelemetry-javawrapper
|
113 |
| - component-version: "--" |
| 135 | + component-version: ${{needs.build-layer.outputs.JAVAWRAPPER_VERSION}} |
114 | 136 | # architecture:
|
115 |
| - runtimes: java8 java8.al2 java11 java17 |
| 137 | + runtimes: java8.al2 java11 java17 |
116 | 138 | release-group: prod
|
117 | 139 | aws_region: ${{ matrix.aws_region }}
|
118 | 140 | secrets: inherit
|
|
0 commit comments