Skip to content

Commit

Permalink
Merge pull request #87 from smeup/chore/cleanup
Browse files Browse the repository at this point in the history
chore: cleanup github actions pipelines, disable integration tests
  • Loading branch information
foresti-smeup authored Nov 4, 2024
2 parents 712701b + 15d5955 commit 8a6432e
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 24 deletions.
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
name: Execute tests on different DBs

on: [push]
on:
workflow_dispatch:
### disable execution until ITs are fixed
# pull_request:
# branches:
# - develop
# - master

jobs:
test:
runs-on: ubuntu-latest

steps:
- name: Set up OpenJDK 21
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'corretto'
Expand All @@ -25,9 +31,9 @@ jobs:
echo "Docker Compose is installed."
fi
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Docker Containers
uses: adambirds/docker-compose-action@v1.3.0
uses: adambirds/docker-compose-action@v1.5.0
with:
compose-file: |
./docker/mongodb/docker-compose.yml
Expand All @@ -36,7 +42,7 @@ jobs:
down-flags: "--volumes"

- name: Setup DynamoDB Local
uses: rrainn/dynamodb-action@v2.0.1
uses: rrainn/dynamodb-action@v4.0.0
with:
dbPath: # undefined by default, if this is undefined inMemory will be used
sharedDb: # undefined by default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,22 @@ name: Deploy to maven central
on:
push:
branches: [master, develop]
workflow_dispatch:
workflow_dispatch:

env:
JAVA_DISTRIBUTION: zulu
JAVA_VERSION: 11

jobs:
build:
maven-deploy-maven-central:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Maven Central Repository
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 11
java-version: ${{ env.JAVA_VERSION }}
distribution: ${{ env.JAVA_DISTRIBUTION }}
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/readme.txt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,23 @@ name: Deploy to nexus
on:
push:
branches: [master, develop]

env:
DISTRIBUTION: zulu
JAVA_DISTRIBUTION: zulu
JAVA_VERSION: 11

jobs:
deploy-jardis-server:
maven-deploy-nexus:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set smeup nexus settings for snapshots
if: ${{ github.ref == 'refs/heads/develop' }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: ${{ env.DISTRIBUTION }}
distribution: ${{ env.JAVA_DISTRIBUTION }}
java-version: ${{ env.JAVA_VERSION }}
server-id: snapshots
cache: 'maven'
Expand All @@ -26,9 +27,9 @@ jobs:

- name: Set smeup nexus settings for releases
if: ${{ github.ref == 'refs/heads/master' }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: ${{ env.DISTRIBUTION }}
distribution: ${{ env.JAVA_DISTRIBUTION }}
java-version: ${{ env.JAVA_VERSION }}
server-id: releases
cache: 'maven'
Expand All @@ -40,5 +41,3 @@ jobs:
env:
NEXUS_USER: ${{ secrets.NEXUS_USER }}
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}


2 changes: 1 addition & 1 deletion manager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.5.0</version>
<version>2.7.4</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions sql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.5.0</version>
<version>2.7.4</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.18</version>
<version>8.0.33</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit 8a6432e

Please sign in to comment.