Merge branch 'staging'

fsinfuhh · Jun 13, 2023 · 69ea435 · 69ea435
2 parents 52c71ce + ac035ef
commit 69ea435
Show file tree

Hide file tree

Showing 4 changed files with 318 additions and 289 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -7,7 +7,11 @@ on:
       - staging
 
 jobs:
+  test:
+    uses: ./.github/workflows/test.yml
+
   build-container:
+    needs: [ test ]
     uses: fsinfuhh/workflows/.github/workflows/build_image.yml@main
 
   determine-app-path:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,6 +1,7 @@
 name: test
 on:
   workflow_dispatch: {}
+  workflow_call: {}
   push: {}
 
 jobs:

diff --git a/Pipfile b/Pipfile
@@ -28,11 +28,11 @@ python-ldap = "~=3.4"
 python-magic = "~=0.4"
 raven = "~=6.10"
 requests = "~=2.28"
-simple-openid-connect = { version = "~=0.2.4", extras = ["django"] }
+simple-openid-connect = { version = "~=0.3.0", extras = ["django"] }
 
 [dev-packages]
 responses = "~=0.22"
-pytest = "*"
+pytest = "==7.1.3"
 pytest-django = "*"
 pytest-env = "*"
 freezegun = "*"