Skip to content

Commit 7649515

Browse files
irinaschubertsubotic
andauthored
fix: Use correct docker image tag after publishing (DEV-614) (#2016)
Co-authored-by: Ivan Subotic <400790+subotic@users.noreply.github.com>
1 parent 2548b8f commit 7649515

2 files changed

Lines changed: 18 additions & 11 deletions

File tree

‎.github/workflows/main.yml‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ jobs:
5555
5656
# ------------------------------------------
5757
# ------------------------------------------
58-
# Test client-test-data
5958
client-test-data-tests:
60-
name: Test client-test-data
59+
name: Run client-test-data
6160
runs-on: ubuntu-latest
6261
steps:
6362
- name: checkout source
@@ -86,7 +85,13 @@ jobs:
8685
uses: coursier/cache-action@v6
8786
- name: generate api-client-test-data
8887
run: make client-test-data
89-
- name: Cleanup before cache
88+
- name: upload client-test-data
89+
uses: actions/upload-artifact@v3
90+
with:
91+
name: client-test-data-zip
92+
path: client-test-data.zip
93+
retention-days: 1
94+
- name: cleanup before cache
9095
shell: bash
9196
run: |
9297
rm -rf "$HOME/.ivy2/local" || true
@@ -121,7 +126,7 @@ jobs:
121126
mkdir -p ~/.docker/cli-plugins/
122127
curl -SL https://github.com/docker/compose/releases/download/v2.2.3/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
123128
chmod +x ~/.docker/cli-plugins/docker-compose
124-
- name: Install dependencies
129+
- name: install dependencies
125130
run: |
126131
sudo apt-get install ca-certificates-java expect
127132
- name: Coursier cache
@@ -133,7 +138,7 @@ jobs:
133138
uses: jwalton/gh-docker-logs@v1
134139
with:
135140
shell: '/bin/sh'
136-
- name: Cleanup before cache
141+
- name: cleanup before cache
137142
shell: bash
138143
run: |
139144
rm -rf "$HOME/.ivy2/local" || true
@@ -155,7 +160,7 @@ jobs:
155160
mkdir -p ~/.docker/cli-plugins/
156161
curl -SL https://github.com/docker/compose/releases/download/v2.2.3/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
157162
chmod +x ~/.docker/cli-plugins/docker-compose
158-
- name: Install dependencies
163+
- name: install dependencies
159164
run: |
160165
python -m pip install --upgrade pip
161166
pip install -r docs/requirements.txt
@@ -218,14 +223,16 @@ jobs:
218223
chmod +x ~/.docker/cli-plugins/docker-compose
219224
- name: install requirements
220225
run: sudo apt-get install ca-certificates-java expect unzip
221-
- name: Install dependencies
226+
- name: install dependencies
222227
run: |
223228
python -m pip install --upgrade pip
224229
pip install -r docs/requirements.txt
225230
npm install --global typedoc
226231
sudo apt-get install graphviz
227-
- name: generate api-client-test-data
228-
run: make client-test-data
232+
- name: download client-test-data
233+
uses: actions/download-artifact@v3
234+
with:
235+
name: client-test-data-zip
229236
- name: add api-client-test-data to release assets
230237
uses: svenstaro/upload-release-action@v2
231238
with:

‎webapi/src/test/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class OntologyV2R2RSpec extends R2RSpec {
6060
// If true, the existing expected response files are overwritten with the HTTP GET responses from the server.
6161
// If false, the responses from the server are compared to the contents fo the expected response files.
6262
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
63-
private val writeTestDataFiles = true
63+
private val writeTestDataFiles = false
6464

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

124124
/**

0 commit comments

Comments
 (0)