Skip to content

Commit

Permalink
NOJIRA update github actions dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
ottenhoff committed Feb 13, 2024
1 parent 657fbe0 commit abac39d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,22 @@ on:

jobs:
maven-build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Git Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 11
distribution: temurin
architecture: x64
cache: maven
- name: Set up Maven
uses: stCarolas/setup-maven@v4.5
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.8.7
maven-version: 3.9.6
- name: Search for bad unicode translations
run: |
find . -name \*.properties -exec grep '\\u[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][^0-9a-fA-F]' {} \; &> grep.txt
Expand All @@ -37,4 +36,5 @@ jobs:
- name: Build with Maven
env:
MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true -Dmaven.wagon.http.retryHandler.count=2 -Dmaven.wagon.http.pool=true
run: mvn --show-version --batch-mode -PskipBrokenTests test license:check
run: mvn --show-version --batch-mode -PskipBrokenTests test license:check

11 changes: 5 additions & 6 deletions .github/workflows/server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,18 @@ on:

jobs:
sakai-deploy:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
JAVA_OPTS: "-Dhttp.agent=Sakai -Xms2512m -Xmx2512m -Dsakai.cookieName=SAKAIID -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dsakai.demo=true -Djava.awt.headless=true --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED --illegal-access=permit -Dsakai.demo=true"

steps:
- name: Git Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 11
distribution: temurin
architecture: x64
cache: maven
- name: Build with Maven
env:
Expand Down Expand Up @@ -52,7 +51,7 @@ jobs:
sudo dpkg -i cloudflared.deb
cloudflared tunnel --url http://localhost:8443 &
- name: Cypress Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: sakaicontrib/cypress-sakai
path: './cypress-sakai'
Expand All @@ -76,7 +75,7 @@ jobs:
echo "::notice title={MySQL Queries}::$QUERIES"
- name: Upload Tomcat log for review
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: tomcat-log
path: tomcat/logs/catalina.out
Expand Down

0 comments on commit abac39d

Please sign in to comment.