From cffe287bd3eaff7a67dc13adc27d097e3bbc9543 Mon Sep 17 00:00:00 2001 From: Joeri Bekker Date: Wed, 22 May 2024 16:17:01 +0200 Subject: [PATCH] :bug: Fix Github actions for unversioned API. --- .github/workflows/generate-postman-collection.yml | 2 +- .github/workflows/generate-sdks.yml | 2 +- .github/workflows/lint-oas.yml | 2 +- .github/workflows/quick-start.yml | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/generate-postman-collection.yml b/.github/workflows/generate-postman-collection.yml index ab98eee..309e38b 100644 --- a/.github/workflows/generate-postman-collection.yml +++ b/.github/workflows/generate-postman-collection.yml @@ -29,4 +29,4 @@ jobs: - name: Create tests folder run: mkdir -p ./tests/postman - name: Generate Postman collection - run: openapi2postmanv2 -s ./src/referentielijsten/api/${{ matrix.version }}/openapi.yaml -o ./tests/postman/collection.json --pretty + run: openapi2postmanv2 -s ./src/referentielijsten/api/openapi.yaml -o ./tests/postman/collection.json --pretty diff --git a/.github/workflows/generate-sdks.yml b/.github/workflows/generate-sdks.yml index b5e34e7..9a5d48b 100644 --- a/.github/workflows/generate-sdks.yml +++ b/.github/workflows/generate-sdks.yml @@ -28,7 +28,7 @@ jobs: run: npm install -g @openapitools/openapi-generator-cli - name: Determing oas path id: vars - run: echo ::set-output name=oas::./src/referentielijsten/api/${{ matrix.version }}/openapi.yaml + run: echo ::set-output name=oas::./src/referentielijsten/api/openapi.yaml - name: Validate schema run: openapi-generator-cli validate -i ${{ steps.vars.outputs.oas }} - name: Generate Java client diff --git a/.github/workflows/lint-oas.yml b/.github/workflows/lint-oas.yml index f65ee83..4ef47da 100644 --- a/.github/workflows/lint-oas.yml +++ b/.github/workflows/lint-oas.yml @@ -27,4 +27,4 @@ jobs: - name: Install spectral run: npm install -g @stoplight/spectral@5 - name: Run OAS linter - run: spectral lint ./src/referentielijsten/api/${{ matrix.version }}/openapi.yaml + run: spectral lint ./src/referentielijsten/api/openapi.yaml diff --git a/.github/workflows/quick-start.yml b/.github/workflows/quick-start.yml index e3cf935..05cb51f 100644 --- a/.github/workflows/quick-start.yml +++ b/.github/workflows/quick-start.yml @@ -8,15 +8,15 @@ jobs: steps: - uses: actions/checkout@v4 - name: Download docker-compose file - run: wget https://raw.githubusercontent.com/maykinmedia/objects-api/master/docker-compose-quickstart.yml -O docker-compose-qs.yml + run: wget https://raw.githubusercontent.com/maykinmedia/referentielijsten/master/docker-compose.yml -O docker-compose-qs.yml - name: Overwrite the docker-compose file to get the "current" one - run: cp docker-compose-quickstart.yml docker-compose-qs.yml + run: cp docker-compose-qs.yml docker-compose.yml - name: Start docker containers - run: docker-compose -f docker-compose-qs.yml up -d + run: docker-compose up -d --no-build - name: Wait until DB container starts run: sleep 10 - - name: Load fixtures - run: docker-compose -f docker-compose-qs.yml exec -T web src/manage.py loaddata demodata + # - name: Load fixtures + # run: docker-compose -f docker-compose-qs.yml exec -T web src/manage.py loaddata demodata - name: Create superuser run: docker-compose -f docker-compose-qs.yml exec -T web src/manage.py createsuperuser --username admin --email admin@admin.nl --no-input - name: Check main page