Skip to content

Commit e69c5b5

Browse files
authored
release automation (#1155)
* release automation Signed-off-by: Gregor Zeitlinger <[email protected]> * release automation Signed-off-by: Gregor Zeitlinger <[email protected]> * release automation Signed-off-by: Gregor Zeitlinger <[email protected]> --------- Signed-off-by: Gregor Zeitlinger <[email protected]>
1 parent 8963973 commit e69c5b5

File tree

5 files changed

+20
-6
lines changed

5 files changed

+20
-6
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ jobs:
2828
REQUIRE_PROTO_UP_TO_DATE: true
2929
run: |
3030
./mvnw clean install
31-
./mvnw javadoc:javadoc -P release # just to check if javadoc is generated
31+
./mvnw javadoc:javadoc -P javadoc # just to check if javadoc is generated

.github/workflows/github-pages.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,8 @@ jobs:
4444
run: |
4545
wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \
4646
&& sudo dpkg -i ${{ runner.temp }}/hugo.deb
47-
- name: Build client_java
48-
run: ./mvnw -B clean install -DskipTests -P release
4947
- name: Make Javadoc
50-
run: ./mvnw -B clean compile javadoc:javadoc javadoc:aggregate -P release
48+
run: ./mvnw -B clean compile javadoc:javadoc javadoc:aggregate -P javadoc
5149
- name: Move the Javadoc to docs/static/api/
5250
run: mv ./target/reports/apidocs ./docs/static/api && echo && echo 'ls ./docs/static/api' && ls ./docs/static/api
5351
- name: Setup Pages

.github/workflows/release.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ jobs:
1616
runs-on: ubuntu-latest
1717

1818
steps:
19+
- name: Debug gpg key - remove after debugging
20+
run: |
21+
echo "$GPG_SIGNING_KEY" | wc -c
22+
echo "$GPG_SIGNING_KEY" | gpg --batch --import-options import-show --import
1923
- name: Checkout Plugin Repository
2024
uses: actions/checkout@v4
2125

pom.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@
314314
</modules>
315315
</profile>
316316
<profile>
317-
<id>release</id>
317+
<id>javadoc</id>
318318
<build>
319319
<plugins>
320320
<plugin>
@@ -329,6 +329,17 @@
329329
</excludePackageNames>
330330
<source>8</source>
331331
</configuration>
332+
</plugin>
333+
</plugins>
334+
</build>
335+
</profile>
336+
<profile>
337+
<id>release</id>
338+
<build>
339+
<plugins>
340+
<plugin>
341+
<groupId>org.apache.maven.plugins</groupId>
342+
<artifactId>maven-javadoc-plugin</artifactId>
332343
<executions>
333344
<execution>
334345
<id>attach-javadocs</id>

prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Buffer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ <T extends DataPointSnapshot> T run(
7272
Long expectedCount = observationCount.getAndAdd(bufferActiveBit);
7373

7474
while (!complete.apply(expectedCount)) {
75-
// Wait until all in-flight threads have added their observations to the histogram
75+
// Wait until all in-flight threads have added their observations to the histogram /
76+
// summary.
7677
// we can't use a condition here, because the other thread doesn't have a lock as it's on
7778
// the fast path.
7879
Thread.yield();

0 commit comments

Comments
 (0)