Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI job #117

Merged
merged 6 commits into from
Dec 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "daily"
63 changes: 63 additions & 0 deletions .github/maven-cd-settings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<!--
~ Copyright (c) 2021 Red Hat, Inc.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<settings>

<interactiveMode>false</interactiveMode>

<servers>
<server>
<id>vertx-snapshots-repository</id>
<username>${env.VERTX_NEXUS_USERNAME}</username>
<password>${env.VERTX_NEXUS_PASSWORD}</password>
</server>
</servers>

<profiles>
<profile>
<id>google-mirror</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<repository>
<id>google-maven-central</id>
<name>GCS Maven Central mirror EU</name>
<url>https://maven-central.storage-download.googleapis.com/maven2/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>google-maven-central</id>
<name>GCS Maven Central mirror</name>
<url>https://maven-central.storage-download.googleapis.com/maven2/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
</settings>
28 changes: 15 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@ on:
push:
branches:
- master
- '[0-9]+.[0-9]+'
pull_request:
branches:
- master
- '[0-9]+.[0-9]+'
schedule:
- cron: '0 4 * * *'
- cron: '0 4 * * *'
jobs:
Test:
name: Run tests
strategy:
matrix:
os: [ubuntu-latest]
jdk: [8, 11]
os: [ ubuntu-latest ]
jdk: [ 11, 17, 21 ]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Install JDK
uses: joschi/setup-jdk@v2
uses: actions/checkout@v3
- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.jdk }}
distribution: 'temurin'
cache: 'maven'
- name: Run tests
run: mvn -q clean verify -B
run: mvn clean verify -B -ntp
Deploy:
name: Deploy to OSSRH
if: ${{ github.repository_owner == 'vert-x3' && (github.event_name == 'push' || github.event_name == 'schedule') }}
Expand All @@ -37,13 +37,15 @@ jobs:
VERTX_NEXUS_PASSWORD: ${{ secrets.VERTX_NEXUS_PASSWORD }}
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install JDK
uses: joschi/setup-jdk@v2
uses: actions/setup-java@v3
with:
java-version: 8
java-version: 11
distribution: 'temurin'
cache: 'maven'
- name: Get project version
run: echo "PROJECT_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:evaluate -Dexpression=project.version -B | grep -v '\[')" >> $GITHUB_ENV
- name: Maven deploy
if: ${{ endsWith(env.PROJECT_VERSION, '-SNAPSHOT') }}
run: mvn deploy -s .travis.maven.settings.xml -DskipTests -B
run: mvn deploy -s .github/maven-cd-settings.xml -DskipTests -B
16 changes: 0 additions & 16 deletions .travis.maven.settings.xml

This file was deleted.

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<modelVersion>4.0.0</modelVersion>
<artifactId>vertx-lang-scala-parent</artifactId>
<version>4.5.1</version>
<version>4.5.2-SNAPSHOT</version>
<packaging>pom</packaging>
<inceptionYear>2016</inceptionYear>
<organization>
Expand Down
2 changes: 1 addition & 1 deletion vertx-lang-scala-codegen/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.vertx</groupId>
<artifactId>vertx-lang-scala-parent</artifactId>
<version>4.5.1</version>
<version>4.5.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>vertx-lang-scala-codegen</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion vertx-lang-scala-itests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.vertx</groupId>
<artifactId>vertx-lang-scala-parent</artifactId>
<version>4.5.1</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>vertx-lang-scala-itests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion vertx-lang-scala-on-the-fly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.vertx</groupId>
<artifactId>vertx-lang-scala-parent</artifactId>
<version>4.5.1</version>
<version>4.5.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion vertx-lang-scala-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.vertx</groupId>
<artifactId>vertx-lang-scala-parent</artifactId>
<version>4.5.1</version>
<version>4.5.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
10 changes: 7 additions & 3 deletions vertx-lang-scala/build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import java.time.LocalDate

ThisBuild / scalaVersion := "3.3.1"
ThisBuild / resolvers += Resolver.mavenLocal
ThisBuild / version := "4.5.1"
ThisBuild / version := "4.5.2-SNAPSHOT"

lazy val currentYear = LocalDate.now().getYear()
lazy val socialLinks = Map(
"github" -> "https://github.com/vert-x3/vertx-lang-scala",
"discord" -> "https://discord.com/invite/6ry7aqPWXy",
Expand All @@ -17,10 +20,11 @@ Compile / doc / scalacOptions ++= Seq(
"-scastie-configuration", s"""
|libraryDependencies += "io.vertx" % "vertx-web" % ${version.value},
|libraryDependencies += "io.vertx" %% "vertx-lang-scala" % ${version.value},
""".stripMargin,
""".stripMargin.stripMargin.replace("\n", " "),
"-Ygenerate-inkuire",
"-project-version", version.value,
"-project-logo", "src/main/markdown/_assets/images/vertx-logo.png",
"-project-footer", "© 2023 Eclipse Vert.x™"
"-project-footer", s$currentYear Eclipse Vert.x™"
)

lazy val root = project
Expand Down
2 changes: 1 addition & 1 deletion vertx-lang-scala/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.vertx</groupId>
<artifactId>vertx-lang-scala-parent</artifactId>
<version>4.5.1</version>
<version>4.5.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down