diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50fc9059..2c1c48dc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -178,13 +178,13 @@ jobs: - name: Trigger deploy run: | if [ ${{ github.ref }} == 'refs/heads/develop' ]; then - pipelineId=TODO + pipelineId=1331 elif [ ${{ github.ref }} == 'refs/heads/staging' ]; then pipelineId=TODO elif [ ${{ github.ref }} == 'refs/heads/master' ]; then pipelineId=TODO elif [ ${{ github.ref }} == 'refs/heads/ci' ]; then - pipelineId=WIP + pipelineId=1331 else echo "No pipeline to trigger for ref ${{ github.ref }}" exit 0 diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml deleted file mode 100644 index a32c8dec..00000000 --- a/.github/workflows/docker.yml +++ /dev/null @@ -1,28 +0,0 @@ -on: - push: - branches: ['release'] - -env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} - -jobs: - build-base: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Setup Python - uses: actions/setup-python@v4 - with: - python-version: '3.11' - - - name: Build and push Docker image - run: > - echo `pwd`/docker -# docker build . --file Dockerfile --tag my-image-name:$(date +%s) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 924d1e61..00000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,75 +0,0 @@ -name: Test - -on: - push: - branches: - - master - - develop - pull_request: - -jobs: -# lint: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2 -# - uses: actions/setup-python@v2 -# -# - name: Install dependencies -# run: | -# python -m pip install --upgrade pip pre-commit -# - name: -# run: pre-commit run --all-files - - test: - runs-on: ubuntu-latest - services: - postgres: - image: postgres:12 - env: - POSTGRES_USER: postgres - POSTGRES_PASSWORD: postgres - POSTGRES_DB: aurora - ports: - - 5432:5432 - options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 - strategy: - fail-fast: false - matrix: - django-version: [ "4.2", ] - python-version: [ "3.11", ] - experimental: [ false ] -# include: -# - django-version: "5.0" -# python-version: "3.11" -# experimental: true - continue-on-error: ${{ matrix.experimental }} - env: - DATABASE_URL: postgres://postgres:postgres@127.0.0.1:5432/aurora - STATIC_URL: /static/ - STATIC_ROOT: - PY_VER: ${{ matrix.python-version}} - DJ_VER: ${{ matrix.django-version}} - SECRET_KEY: super-secret-key - steps: - - uses: actions/checkout@v4 - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - - name: Install pdm - run: python -m pip install --upgrade pdm - - - name: Install dependencies - run: | - pdm venv create - pdm venv activate in-project - pdm sync - - - name: Run tests - run: pdm run pytest tests/ --create-db - - - uses: codecov/codecov-action@v4 - with: - verbose: false # optional (default = false) diff --git a/.gitignore b/.gitignore index e187d5f4..578bd6ae 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ docker/conf/redis.conf src/aurora/staticfiles .pdm-python +.vscode \ No newline at end of file