Fix

yunojuno · Sep 18, 2023 · 3c0ec0a · 3c0ec0a
1 parent 7b2715e
commit 3c0ec0a
Showing 1 changed file with 55 additions and 56 deletions.
diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
@@ -9,54 +9,54 @@ on:
     types: [opened, synchronize, reopened]
 
 jobs:
-  format:
-    name: Check formatting
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        toxenv: [fmt, lint, mypy]
-    env:
-      TOXENV: ${{ matrix.toxenv }}
-
-    steps:
-      - name: Check out the repository
-        uses: actions/checkout@v3
-
-      - name: Set up Python (3.11)
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.11"
-
-      - name: Install and run tox
-        run: |
-          pip install tox
-          tox
-
-  test:
-    name: Run tests (SQLite)
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        python: ["3.10", "3.11"]
-        django: ["32", "40", "41", "42", "main"]
-
-    env:
-      TOXENV: py${{ matrix.python }}-django${{ matrix.django }}
-
-    steps:
-      - name: Check out the repository
-        uses: actions/checkout@v3
-
-      - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python }}
-
-      - name: Install and run tox
-        run: |
-          pip install tox
-          tox
+  #   format:
+  #     name: Check formatting
+  #     runs-on: ubuntu-latest
+  #     strategy:
+  #       matrix:
+  #         toxenv: [fmt, lint, mypy]
+  #     env:
+  #       TOXENV: ${{ matrix.toxenv }}
+
+  #     steps:
+  #       - name: Check out the repository
+  #         uses: actions/checkout@v3
+
+  #       - name: Set up Python (3.11)
+  #         uses: actions/setup-python@v4
+  #         with:
+  #           python-version: "3.11"
+
+  #       - name: Install and run tox
+  #         run: |
+  #           pip install tox
+  #           tox
+
+  #   test:
+  #     name: Run tests (SQLite)
+  #     runs-on: ubuntu-latest
+
+  #     strategy:
+  #       matrix:
+  #         python: ["3.10", "3.11"]
+  #         django: ["32", "40", "41", "42", "main"]
+
+  #     env:
+  #       TOXENV: py${{ matrix.python }}-django${{ matrix.django }}
+
+  #     steps:
+  #       - name: Check out the repository
+  #         uses: actions/checkout@v3
+
+  #       - name: Set up Python ${{ matrix.python }}
+  #         uses: actions/setup-python@v4
+  #         with:
+  #           python-version: ${{ matrix.python }}
+
+  #       - name: Install and run tox
+  #         run: |
+  #           pip install tox
+  #           tox
 
   test-pg:
     name: Run tests (PostgreSQL)
@@ -66,16 +66,17 @@ jobs:
       postgres:
         image: postgres
         env:
+          POSTGRES_DB: postgres
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: postgres
-          POSTGRES_PORT: 5432
+        ports:
+          - 5432:5432
         # Set health checks to wait until postgres has started
         options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+          --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+    env:
+        DATABASE_URL: postgres://postgres:postgres@postgres:5432/postgres
 
     steps:
       - name: Check out the repository
@@ -90,6 +91,4 @@ jobs:
         run: pip install tox
 
       - name: Run tox (pg-only)
-        env:
-          DATABASE_URL: postgres://postgres:postgres@postgres:5432/postgres
         run: tox -e pg-only