Skip to content

Commit

Permalink
Merge branch 'master' into prepV5
Browse files Browse the repository at this point in the history
  • Loading branch information
pgdurand authored Mar 15, 2023
2 parents 9454b88 + 49587ab commit 03fabc9
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 2 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/ant.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# This workflow will build a Java project with Ant
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-ant

name: Java CI

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
steps:
- uses: actions/checkout@v3
- name: Set up JDK 9
uses: actions/setup-java@v3
with:
java-version: '9'
distribution: 'adopt'
- name: Build with Ant
run: ant -noinput -buildfile build.xml makedistrib
1 change: 1 addition & 0 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
<or>
<equals arg1="1.8" arg2="${ant.java.version}" />
<equals arg1="1.9" arg2="${ant.java.version}" />
<equals arg1="9" arg2="${ant.java.version}" />
</or>
</not>
</condition>
Expand Down
4 changes: 2 additions & 2 deletions conf/scripts/get_ip_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ echo "Getting Interpro release number"

# ========================================================================================
# Section: include API
S_NAME=$(realpath "$0")
[[ -z "$BDM_CONF_SCRIPTS" ]] && script_dir=$(dirname "$S_NAME") || script_dir=$BDM_CONF_SCRIPTS
S_NAME=$( cd -P -- "$(dirname -- "$(command -v -- "$0")")" && pwd -P )
[[ -z "$BDM_CONF_SCRIPTS" ]] && script_dir=$S_NAME || script_dir=$BDM_CONF_SCRIPTS
. $script_dir/scheduler/common.sh

# ========================================================================================
Expand Down

0 comments on commit 03fabc9

Please sign in to comment.