diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c19c0fc..1618ddd 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -235,9 +235,11 @@ jobs: needs: [check] if: github.ref_name == 'main' || github.ref_name == 'dev' env: + CLIENT_SECRET: ${{ github.ref_name == 'main' && secrets.PROD_CLIENT_SECRET || secrets.STAGING_CLIENT_SECRET }} + DATABASE_URL: ${{ github.ref_name == 'main' && secrets.PROD_DATABASE_URL || secrets.STAGING_DATABASE_URL }} GITHUB_USERNAME: ${{ github.actor }} GITHUB_PASSWORD: ${{ secrets.GITHUB_TOKEN }} - DEVELOPER_TOKEN: ${{ secrets.DEVELOPER_TOKEN }} + # DEVELOPER_TOKEN: ${{ secrets.DEVELOPER_TOKEN }} DOMAIN: ${{ github.ref_name == 'main' && vars.PROD_DOMAIN || vars.STAGING_DOMAIN }} SSH_KEY: ${{ github.ref_name == 'main' && secrets.PROD_SSH_KEY || secrets.STAGING_SSH_KEY }} steps: diff --git a/docker-compose.yaml b/docker-compose.yaml index 2d5f2cd..7a466b3 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,14 +1,3 @@ -x-logging: &default-logging - driver: loki - options: - loki-url: 'http://localhost:3100/api/prom/push' - loki-pipeline-stages: | - - multiline: - firstline: '^\d{4}-\d{2}-\d{2} \d{1,2}:\d{2}:\d{2}' - max_wait_time: 3s - - regex: - expression: '^(?P