Skip to content
Permalink
Browse files
fix: Use correct docker image tag after publishing (DEV-614) (#2016)
Co-authored-by: Ivan Subotic <400790+subotic@users.noreply.github.com>
  • Loading branch information
irinaschubert and subotic committed Mar 8, 2022
1 parent 2548b8f commit 7649515230fa0048b12a1e6cb113e8cce7e73c54
Showing with 18 additions and 11 deletions.
  1. +16 −9 .github/workflows/main.yml
  2. +2 −2 webapi/src/test/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala
@@ -55,9 +55,8 @@ jobs:
# ------------------------------------------
# ------------------------------------------
# Test client-test-data
client-test-data-tests:
name: Test client-test-data
name: Run client-test-data
runs-on: ubuntu-latest
steps:
- name: checkout source
@@ -86,7 +85,13 @@ jobs:
uses: coursier/cache-action@v6
- name: generate api-client-test-data
run: make client-test-data
- name: Cleanup before cache
- name: upload client-test-data
uses: actions/upload-artifact@v3
with:
name: client-test-data-zip
path: client-test-data.zip
retention-days: 1
- name: cleanup before cache
shell: bash
run: |
rm -rf "$HOME/.ivy2/local" || true
@@ -121,7 +126,7 @@ jobs:
mkdir -p ~/.docker/cli-plugins/
curl -SL https://github.com/docker/compose/releases/download/v2.2.3/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
chmod +x ~/.docker/cli-plugins/docker-compose
- name: Install dependencies
- name: install dependencies
run: |
sudo apt-get install ca-certificates-java expect
- name: Coursier cache
@@ -133,7 +138,7 @@ jobs:
uses: jwalton/gh-docker-logs@v1
with:
shell: '/bin/sh'
- name: Cleanup before cache
- name: cleanup before cache
shell: bash
run: |
rm -rf "$HOME/.ivy2/local" || true
@@ -155,7 +160,7 @@ jobs:
mkdir -p ~/.docker/cli-plugins/
curl -SL https://github.com/docker/compose/releases/download/v2.2.3/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
chmod +x ~/.docker/cli-plugins/docker-compose
- name: Install dependencies
- name: install dependencies
run: |
python -m pip install --upgrade pip
pip install -r docs/requirements.txt
@@ -218,14 +223,16 @@ jobs:
chmod +x ~/.docker/cli-plugins/docker-compose
- name: install requirements
run: sudo apt-get install ca-certificates-java expect unzip
- name: Install dependencies
- name: install dependencies
run: |
python -m pip install --upgrade pip
pip install -r docs/requirements.txt
npm install --global typedoc
sudo apt-get install graphviz
- name: generate api-client-test-data
run: make client-test-data
- name: download client-test-data
uses: actions/download-artifact@v3
with:
name: client-test-data-zip
- name: add api-client-test-data to release assets
uses: svenstaro/upload-release-action@v2
with:
@@ -60,7 +60,7 @@ class OntologyV2R2RSpec extends R2RSpec {
// If true, the existing expected response files are overwritten with the HTTP GET responses from the server.
// If false, the responses from the server are compared to the contents fo the expected response files.
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
private val writeTestDataFiles = true
private val writeTestDataFiles = false

override lazy val rdfDataObjects = List(
RdfDataObject(
@@ -118,7 +118,7 @@ class OntologyV2R2RSpec extends R2RSpec {
) {
def makeFile(mediaType: MediaType.NonBinary): Path = {
val fileSuffix = mediaType.fileExtensions.head
Paths.get("..", "..", "test_data", "ontologyR2RV2", s"$fileBasename.$fileSuffix")
Paths.get("..", "test_data", "ontologyR2RV2", s"$fileBasename.$fileSuffix")
}

/**

0 comments on commit 7649515

Please sign in to comment.