Skip to content

Commit f76c290

Browse files
committed
docs:update GitHub Actions.
1 parent 7fd7a22 commit f76c290

File tree

6 files changed

+14
-75
lines changed

6 files changed

+14
-75
lines changed

.github/workflows/integration.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ jobs:
88
release:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
- name: Set up Maven Central Repository
13-
uses: actions/setup-java@v3
13+
uses: actions/setup-java@v4
1414
with:
1515
java-version: '8'
1616
distribution: 'temurin'

.github/workflows/snapshot.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
IS_SNAPSHOT: ${{ steps.set_output_1.outputs.IS_SNAPSHOT }}
1515
steps:
1616
- name: Checkout codes
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
- name: Check deploy type
1919
id: set_output_1
2020
run: |
@@ -30,9 +30,9 @@ jobs:
3030
needs: check-snapshot
3131
if: ${{ needs.check-snapshot.outputs.IS_SNAPSHOT == 'true' }}
3232
steps:
33-
- uses: actions/checkout@v3
33+
- uses: actions/checkout@v4
3434
- name: Set up Maven Central Repository
35-
uses: actions/setup-java@v3
35+
uses: actions/setup-java@v4
3636
with:
3737
java-version: '8'
3838
distribution: 'temurin'

.github/workflows/testing.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ jobs:
1616
build:
1717
strategy:
1818
matrix:
19-
java: [ 8, 11, 17 ]
19+
java: [ 8, 11, 17, 21 ]
2020
os: [ 'windows-latest', 'ubuntu-latest' ]
2121
runs-on: ${{ matrix.os }}
2222
steps:
2323
- name: Checkout codes
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525
- name: Set up JDK ${{ matrix.java }}
26-
uses: actions/setup-java@v3
26+
uses: actions/setup-java@v4
2727
with:
2828
distribution: 'temurin'
2929
java-version: ${{ matrix.java }}
3030
- name: Cache local Maven repository
31-
uses: actions/cache@v3
31+
uses: actions/cache@v4
3232
with:
3333
path: ~/.m2/repository
3434
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -37,4 +37,4 @@ jobs:
3737
- name: Test with Maven
3838
run: mvn clean test -B -U -Psonatype --file pom.xml
3939
- name: Upload coverage reports to Codecov
40-
uses: codecov/codecov-action@v3
40+
uses: codecov/codecov-action@v4

polaris-plugins/polaris-plugins-healthchecker/healthchecker-http/src/test/java/com/tencent/polaris/plugins/outlier/detector/http/HttpHealthCheckerTest.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,11 @@
4545
import java.net.InetAddress;
4646
import java.net.InetSocketAddress;
4747
import java.util.Collection;
48-
import java.util.HashMap;
49-
import java.util.List;
5048
import java.util.Map;
5149
import java.util.Objects;
5250
import java.util.UUID;
5351
import java.util.concurrent.ConcurrentHashMap;
54-
import java.util.concurrent.CountDownLatch;
5552
import java.util.concurrent.TimeUnit;
56-
import java.util.concurrent.atomic.AtomicReference;
57-
import java.util.function.BiConsumer;
5853
import java.util.function.Consumer;
5954

6055
import static com.tencent.polaris.test.common.TestUtils.SERVER_ADDRESS_ENV;
@@ -263,7 +258,9 @@ public void handle(HttpExchange exchange) throws IOException {
263258

264259
@Override
265260
public void close() throws IOException {
266-
this.thread.stop();
261+
if (this.thread != null && this.thread.isAlive()) {
262+
this.thread.interrupt();
263+
}
267264
}
268265
}
269266
}

pom.xml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666

6767
<properties>
6868
<!-- Project revision -->
69-
<revision>2.0.1.0-RC1</revision>
69+
<revision>2.0.1.0-SNAPSHOT</revision>
7070

7171
<timestamp>${maven.build.timestamp}</timestamp>
7272
<skip.maven.deploy>false</skip.maven.deploy>
@@ -105,7 +105,6 @@
105105
<maven.gpg.plugin.version>3.0.1</maven.gpg.plugin.version>
106106
<maven.shaded.plugin.version>3.2.4</maven.shaded.plugin.version>
107107
<maven.deploy.plugin.version>3.0.0-M1</maven.deploy.plugin.version>
108-
<maven.failsafe.plugin.version>3.0.0-M5</maven.failsafe.plugin.version>
109108
<maven.flatten.plugin.version>1.2.5</maven.flatten.plugin.version>
110109
<maven.clean.plugin.version>3.1.0</maven.clean.plugin.version>
111110
<okhttp.version>2.7.5</okhttp.version>
@@ -197,19 +196,6 @@
197196
</excludes>
198197
</configuration>
199198
</plugin>
200-
<plugin>
201-
<groupId>org.apache.maven.plugins</groupId>
202-
<artifactId>maven-failsafe-plugin</artifactId>
203-
<version>${maven.failsafe.plugin.version}</version>
204-
<executions>
205-
<execution>
206-
<goals>
207-
<goal>integration-test</goal>
208-
<goal>verify</goal>
209-
</goals>
210-
</execution>
211-
</executions>
212-
</plugin>
213199
<plugin>
214200
<groupId>org.apache.maven.plugins</groupId>
215201
<artifactId>maven-source-plugin</artifactId>

0 commit comments

Comments
 (0)