Skip to content
This repository was archived by the owner on Jun 1, 2022. It is now read-only.

Commit a07be9f

Browse files
committed
Upgrade OpenJDK17 Ubuntu and Github Action versions.
Add prompts to setup script installation process. - tested on Ubuntu 20.04 w/ bash and M1 Mac w/ zsh
1 parent 3af8a1f commit a07be9f

File tree

11 files changed

+163
-81
lines changed

11 files changed

+163
-81
lines changed

.github/actions/test-backend/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openjdk:15-alpine
1+
FROM openjdk:17-alpine
22

33
LABEL "name"="Backend Gradle Test"
44
LABEL "maintainer"="Kyle Gorak"

.github/actions/test-backend/entrypoint.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/bin/sh
22

3-
set -eou pipefail
3+
set -eu pipefail
44

5-
if [[ -z "$GITHUB_WORKSPACE" ]]; then
5+
if [ -z "$GITHUB_WORKSPACE" ]; then
66
echo "Set the GITHUB_WORKSPACE env variable."
77
exit 1
88
fi
99

10-
if [[ -z "$GITHUB_REPOSITORY" ]]; then
10+
if [ -z "$GITHUB_REPOSITORY" ]; then
1111
echo "Set the GITHUB_REPOSITORY env variable."
1212
exit 1
1313
fi

.github/actions/test-frontend/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:12.18.2-alpine3.12
1+
FROM node:16.14.2-alpine3.14
22

33
LABEL "name"="Frontend Yarn Test"
44
LABEL "maintainer"="Kyle Gorak"

.github/actions/test-frontend/entrypoint.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
#!/bin/sh
22

3-
set -eou pipefail
3+
set -eu pipefail
44

5-
if [[ -z "$GITHUB_WORKSPACE" ]]; then
5+
if [ -z "$GITHUB_WORKSPACE" ]; then
66
echo "Set the GITHUB_WORKSPACE env variable."
77
exit 1
88
fi
99

10-
if [[ -z "$GITHUB_REPOSITORY" ]]; then
10+
if [ -z "$GITHUB_REPOSITORY" ]; then
1111
echo "Set the GITHUB_REPOSITORY env variable."
1212
exit 1
1313
fi
1414

15-
cd "$GITHUB_WORKSPACE"/client || exit 1
15+
cd client || exit 1
1616
echo "******* Testing Frontend"
1717
yarn install
1818
yarn lint:ci

.github/workflows/branch-flow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ on:
99
jobs:
1010
test:
1111
name: run-tests
12-
runs-on: ubuntu-18.04
12+
runs-on: ubuntu-20.04
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1515
- uses: ./.github/actions/test-frontend
1616
- uses: ./.github/actions/test-backend

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- name: Checkout repository
25-
uses: actions/checkout@v2
25+
uses: actions/checkout@v3
2626

2727
# Initializes the CodeQL tools for scanning.
2828
- name: Initialize CodeQL

.github/workflows/master-flow.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ on:
66

77
jobs:
88
build:
9-
runs-on: ubuntu-18.04
9+
runs-on: ubuntu-20.04
1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v3
1212

13-
- name: Set up JDK 15
14-
uses: actions/setup-java@v1
13+
- name: Set up JDK 17
14+
uses: actions/setup-java@v2
1515
with:
16-
java-version: 15
16+
distributiuon: 'temurin'
17+
java-version: '17'
1718

1819
- name: Build Jar
1920
run: ./pipeline/build.sh
@@ -25,7 +26,7 @@ jobs:
2526
path: build/libs/*.jar
2627
test:
2728
name: run tests
28-
runs-on: ubuntu-18.04
29+
runs-on: ubuntu-20.04
2930
needs: build
3031
services:
3132
postgres:
@@ -39,11 +40,12 @@ jobs:
3940
# needed because the postgres container does not provide a healthcheck
4041
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
4142
steps:
42-
- uses: actions/checkout@v2
43+
- uses: actions/checkout@v3
4344

44-
- uses: actions/setup-java@v1
45+
- uses: actions/setup-java@v2
4546
with:
46-
java-version: 15
47+
distribution: 'temurin'
48+
java-version: '17'
4749
- run: ./gradlew test --info
4850
env:
4951
RDS_HOSTNAME: localhost

.github/workflows/ossar-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
# Checkout your code repository to scan
2020
- name: Checkout repository
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@v3
2222
with:
2323
# We must fetch at least the immediate parents so that if this is
2424
# a pull request then we can checkout the head.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ yarn*.log
6464

6565
**/.DS_STORE
6666

67+
# jenv
68+
.java-version
6769

6870
# Elastic Beanstalk Files
6971
.elasticbeanstalk/*

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ plugins {
2020

2121
group = "events.tracked.tsr"
2222
version = "0.0.1-SNAPSHOT"
23-
java.sourceCompatibility = JavaVersion.VERSION_15
23+
java.sourceCompatibility = JavaVersion.VERSION_17
2424

2525
node {
2626
download.set(false)
@@ -87,7 +87,7 @@ dependencies {
8787
tasks.withType<KotlinCompile> {
8888
kotlinOptions {
8989
freeCompilerArgs = listOf("-Xjsr305=strict")
90-
jvmTarget = "15"
90+
jvmTarget = "17"
9191
}
9292
}
9393

0 commit comments

Comments
 (0)