From c708e192b895ce59454f0f06729903aa3a6dd079 Mon Sep 17 00:00:00 2001 From: Bram Boskamp Date: Wed, 14 Jun 2023 14:19:18 +0000 Subject: [PATCH 1/3] update fairdatapipeline version; also update opencsv version --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index f773380..6e4e47a 100644 --- a/build.gradle +++ b/build.gradle @@ -15,8 +15,8 @@ repositories { } dependencies { - implementation 'org.fairdatapipeline:api:1.0.0-rc1' - implementation 'com.opencsv:opencsv:5.6' + implementation 'org.fairdatapipeline:api:1.0.0-rc3' + implementation 'com.opencsv:opencsv:5.7.1' implementation('org.slf4j:slf4j-simple:1.7.36') } From fd073da4fc8b3c926344d82af45383c890629000 Mon Sep 17 00:00:00 2001 From: Bram Boskamp Date: Wed, 14 Jun 2023 14:57:44 +0000 Subject: [PATCH 2/3] workflow yml ; use actions @v3 --- .github/workflows/gradle-build.yml | 4 ++-- .github/workflows/runWithFairCli.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index be5698d..e30810a 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -16,9 +16,9 @@ jobs: packages: write steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: '11' distribution: 'adopt' diff --git a/.github/workflows/runWithFairCli.yml b/.github/workflows/runWithFairCli.yml index 463e976..edd0948 100644 --- a/.github/workflows/runWithFairCli.yml +++ b/.github/workflows/runWithFairCli.yml @@ -16,9 +16,9 @@ jobs: packages: write steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: '11' distribution: 'adopt' @@ -30,7 +30,7 @@ jobs: - name: Install local registry run: | /bin/bash -c "$(curl -fsSL https://data.scrc.uk/static/localregistry.sh)" - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v3 with: python-version: '3.x' - name: install fair-cli from pip From 0f64ff61d59b523e0a7def64ab3dcefbecb95ff3 Mon Sep 17 00:00:00 2001 From: Ryan J Field <57794045+RyanJField@users.noreply.github.com> Date: Thu, 15 Jun 2023 09:24:55 +0100 Subject: [PATCH 3/3] Update runWithFairCli.yml Fix CI --- .github/workflows/runWithFairCli.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/runWithFairCli.yml b/.github/workflows/runWithFairCli.yml index edd0948..cfa7298 100644 --- a/.github/workflows/runWithFairCli.yml +++ b/.github/workflows/runWithFairCli.yml @@ -37,7 +37,7 @@ jobs: run: pip install fair-cli - name: run javaSimpleModel with fair cli run: | - fair init --ci - fair pull src/main/resources/seirs-config.yaml - fair run src/main/resources/seirs-config.yaml + fair init --ci --local + fair pull --local src/main/resources/seirs-config.yaml + fair run --local src/main/resources/seirs-config.yaml