Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Use correct docker image tag after publishing (DEV-614) #2016

Merged
merged 9 commits into from Mar 8, 2022
Merged

fix: Use correct docker image tag after publishing (DEV-614) #2016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
91ee0d5
set writeTestDataFiles to false
Mar 7, 2022
ae294cd
Update GitHub CI workflow
Mar 7, 2022
d00ed80
add the client test data to the release assets
Mar 7, 2022
a237fe4
Merge branch 'main' into wip/DEV-614-fix-naming-of-docker-image
subotic Mar 7, 2022
6770202
improve naming
Mar 7, 2022
cbaa601
Merge branch 'wip/DEV-614-fix-naming-of-docker-image' of https://gith…
Mar 7, 2022
c352937
set retention period
Mar 7, 2022
433f9b5
fix file path in makeFile
Mar 7, 2022
05ba7c3
fix path for test_data
Mar 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 16 additions & 9 deletions .github/workflows/main.yml
View file
Open in desktop
Expand Up @@ -55,9 +55,8 @@ jobs:

# ------------------------------------------
# ------------------------------------------
# Test client-test-data
client-test-data-tests:
name: Test client-test-data
name: Run client-test-data
irinaschubert marked this conversation as resolved.
Show resolved Hide resolved
runs-on: ubuntu-latest
steps:
- name: checkout source
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions webapi/src/test/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala
View file
Open in desktop
Expand Up @@ -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(
Expand Down Expand Up @@ -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")
}

/**
Expand Down