Skip to content

Commit

Permalink
Attempt to fix CI build.
Browse files Browse the repository at this point in the history
  • Loading branch information
at88mph committed May 21, 2024
1 parent 73c5abe commit ffb2cf7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,15 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: 1.8
distribution: 'temurin'
java-version: 11

- name: Install attr package
run: sudo apt-get install -y attr

- name: build and test cadc-util-fs
run: cd cadc-util-fs && ../gradlew --info clean build javadoc install
Expand Down
2 changes: 1 addition & 1 deletion cavern/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM images.opencadc.org/library/cadc-tomcat:1

## cavern specific
RUN dnf install -y acl && dnf clean all
RUN dnf install -y acl attr && dnf clean all

COPY build/libs/cavern.war /usr/share/tomcat/webapps/
2 changes: 1 addition & 1 deletion cavern/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repositories {

apply from: '../opencadc.gradle'

sourceCompatibility = 1.8
sourceCompatibility = 11

group = 'org.opencadc'

Expand Down

0 comments on commit ffb2cf7

Please sign in to comment.