Skip to content

Commit 040f71c

Browse files
committed
Fix CI build
1 parent 43b4658 commit 040f71c

File tree

5 files changed

+113
-38
lines changed

5 files changed

+113
-38
lines changed

.github/workflows/ci-4.x.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: vertx-http-proxy (4.x)
2+
on:
3+
schedule:
4+
- cron: '0 4 * * *'
5+
jobs:
6+
CI:
7+
strategy:
8+
matrix:
9+
include:
10+
- os: ubuntu-latest
11+
jdk: 8
12+
- os: windows-latest
13+
jdk: 8
14+
- os: ubuntu-latest
15+
jdk: 17
16+
uses: ./.github/workflows/ci.yml
17+
with:
18+
branch: 4.x
19+
jdk: ${{ matrix.jdk }}
20+
os: ${{ matrix.os }}
21+
secrets: inherit
22+
Deploy:
23+
if: ${{ github.repository_owner == 'eclipse-vertx' && (github.event_name == 'push' || github.event_name == 'schedule') }}
24+
needs: CI
25+
uses: ./.github/workflows/deploy.yml
26+
with:
27+
branch: 4.x
28+
jdk: 8
29+
secrets: inherit

.github/workflows/ci-5.x.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: vertx-http-proxy (5.x)
2+
on:
3+
push:
4+
branches:
5+
- main
6+
pull_request:
7+
branches:
8+
- main
9+
schedule:
10+
- cron: '0 5 * * *'
11+
jobs:
12+
CI:
13+
strategy:
14+
matrix:
15+
include:
16+
- os: ubuntu-latest
17+
jdk: 8
18+
- os: windows-latest
19+
jdk: 8
20+
- os: ubuntu-latest
21+
jdk: 17
22+
uses: ./.github/workflows/ci.yml
23+
with:
24+
branch: ${{ github.head_ref || github.ref_name }}
25+
jdk: ${{ matrix.jdk }}
26+
os: ${{ matrix.os }}
27+
secrets: inherit
28+
Deploy:
29+
if: ${{ github.repository_owner == 'eclipse-vertx' && (github.event_name == 'push' || github.event_name == 'schedule') }}
30+
needs: CI
31+
uses: ./.github/workflows/deploy.yml
32+
with:
33+
branch: ${{ github.head_ref || github.ref_name }}
34+
jdk: 8
35+
secrets: inherit

.github/workflows/ci.yml

Lines changed: 15 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,29 @@
11
name: CI
22
on:
3-
push:
4-
branches:
5-
- main
6-
- '[0-9]+.[0-9]+'
7-
pull_request:
8-
branches:
9-
- main
10-
- '[0-9]+.[0-9]+'
11-
schedule:
12-
- cron: '0 4 * * *'
3+
workflow_call:
4+
inputs:
5+
branch:
6+
required: true
7+
type: string
8+
jdk:
9+
default: 8
10+
type: string
11+
os:
12+
default: ubuntu-latest
13+
type: string
1314
jobs:
1415
Test:
1516
name: Run tests
16-
strategy:
17-
matrix:
18-
os: [ubuntu-latest]
19-
jdk: [8, 17]
20-
runs-on: ${{ matrix.os }}
17+
runs-on: ${{ inputs.os }}
2118
steps:
2219
- name: Checkout
2320
uses: actions/checkout@v2
21+
with:
22+
ref: ${{ inputs.branch }}
2423
- name: Install JDK
2524
uses: actions/setup-java@v2
2625
with:
27-
java-version: ${{ matrix.jdk }}
26+
java-version: ${{ inputs.jdk }}
2827
distribution: temurin
2928
- name: Run tests
3029
run: mvn -s .github/maven-ci-settings.xml -q clean verify -B
31-
Deploy:
32-
name: Deploy to OSSRH
33-
if: ${{ github.repository_owner == 'eclipse-vertx' && github.event_name == 'push' || github.event_name == 'schedule' }}
34-
needs: Test
35-
runs-on: ubuntu-latest
36-
env:
37-
VERTX_NEXUS_USERNAME: ${{ secrets.VERTX_NEXUS_USERNAME }}
38-
VERTX_NEXUS_PASSWORD: ${{ secrets.VERTX_NEXUS_PASSWORD }}
39-
steps:
40-
- name: Checkout
41-
uses: actions/checkout@v2
42-
- name: Install JDK
43-
uses: actions/setup-java@v2
44-
with:
45-
java-version: 8
46-
distribution: temurin
47-
- name: Get project version
48-
run: echo "PROJECT_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:evaluate -Dexpression=project.version -B | grep -v '\[')" >> $GITHUB_ENV
49-
- name: Maven deploy
50-
if: ${{ endsWith(env.PROJECT_VERSION, '-SNAPSHOT') }}
51-
run: mvn deploy -s .github/maven-cd-settings.xml -DskipTests -B

.github/workflows/deploy.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Deploy
2+
on:
3+
workflow_call:
4+
inputs:
5+
branch:
6+
required: true
7+
type: string
8+
jdk:
9+
default: 8
10+
type: string
11+
jobs:
12+
Deploy:
13+
name: Deploy to OSSRH
14+
runs-on: ubuntu-latest
15+
env:
16+
VERTX_NEXUS_USERNAME: ${{ secrets.VERTX_NEXUS_USERNAME }}
17+
VERTX_NEXUS_PASSWORD: ${{ secrets.VERTX_NEXUS_PASSWORD }}
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v2
21+
with:
22+
ref: ${{ inputs.branch }}
23+
- name: Install JDK
24+
uses: actions/setup-java@v2
25+
with:
26+
java-version: ${{ inputs.jdk }}
27+
distribution: temurin
28+
- name: Get project version
29+
run: echo "PROJECT_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:evaluate -Dexpression=project.version -B | grep -v '\[')" >> $GITHUB_ENV
30+
- name: Maven deploy
31+
if: ${{ endsWith(env.PROJECT_VERSION, '-SNAPSHOT') }}
32+
run: mvn deploy -s .github/maven-cd-settings.xml -DskipTests -B

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
[![Build Status](https://github.com/eclipse-vertx/vertx-http-proxy/workflows/CI/badge.svg?branch=main)](https://github.com/eclipse-vertx/vertx-http-proxy/actions?query=workflow%3ACI)
1+
[![Build Status (5.x)](https://github.com/eclipse-vertx/vertx-http-proxy/actions/workflows/ci-5.x.yml/badge.svg)](https://github.com/eclipse-vertx/vertx-http-proxy/actions/workflows/ci-5.x.yml)
2+
[![Build Status (4.x)](https://github.com/eclipse-vertx/vertx-http-proxy/actions/workflows/ci-4.x.yml/badge.svg)](https://github.com/eclipse-vertx/vertx-http-proxy/actions/workflows/ci-4.x.yml)
23

34
# Vert.x Http Proxy
45

0 commit comments

Comments
 (0)