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

Fix pytest during PRs #801

Merged
merged 7 commits into from
Sep 4, 2023
+8 −14
Merged

Fix pytest during PRs #801

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
338b2d1
ci: use head_ref if PR, else ref_name
spwoodcock Sep 4, 2023
6d5630f
ci: use base_ref over head_ref for PRs
spwoodcock Sep 4, 2023
bd63436
ci: pull/pr refs try with gitlab conditionals
spwoodcock Sep 4, 2023
decad84
ci: test hardcoding environment
spwoodcock Sep 4, 2023
14cf41f
ci: set pytest environment to 'test'
spwoodcock Sep 4, 2023
4d705de
ci: fix pytest workflow, use env vars
spwoodcock Sep 4, 2023
0d02670
ci: use vars instead of env for environment
spwoodcock Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions .github/workflows/pytest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,17 @@ jobs:
test:
runs-on: ubuntu-latest
environment:
name: ${{ github.ref_name }}
name: test

container:
image: ghcr.io/hotosm/fmtm/backend:ci-${{ github.ref_name }}
image: ghcr.io/hotosm/fmtm/backend:ci-${{ github.base_ref || github.ref_name }}
env:
ODK_CENTRAL_URL: https://central-proxy
ODK_CENTRAL_USER: [email protected]
ODK_CENTRAL_PASSWD: odk
OSM_CLIENT_ID: test
OSM_CLIENT_SECRET: test
OSM_SECRET_KEY: test
# Fix why env. vars not working below
# OSM_CLIENT_ID: ${{ env.OSM_TEST_CLIENT_ID }}
# OSM_CLIENT_SECRET: ${{ env.OSM_TEST_CLIENT_SECRET }}
# OSM_SECRET_KEY: ${{ env.OSM_TEST_SECRET_KEY }}
# FRONTEND_MAIN_URL: "ui-main:8080"
# FRONTEND_MAP_URL: "ui-map:8081"
ODK_CENTRAL_URL: ${{ vars.ODK_CENTRAL_URL }}
ODK_CENTRAL_USER: ${{ vars.ODK_CENTRAL_USER }}
ODK_CENTRAL_PASSWD: ${{ vars.ODK_CENTRAL_PASSWD }}
OSM_CLIENT_ID: ${{ vars.OSM_CLIENT_ID }}
OSM_CLIENT_SECRET: ${{ vars.OSM_CLIENT_SECRET }}
OSM_SECRET_KEY: ${{ vars.OSM_SECRET_KEY }}
options: --user root

services:
Expand Down
Loading