Skip to content

Commit

Permalink
debug
Browse files Browse the repository at this point in the history
  • Loading branch information
Emterry committed Dec 4, 2024
1 parent 901db7f commit 1b982f1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 26 deletions.
25 changes: 0 additions & 25 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,6 @@ jobs:
with:
version: latest
endpoint: builders

# - name: Install Docker Compose
# id: docker-compose
# shell: bash
# env:
# IMAGE_TAG: ${{ github.sha }}
# run: |
# sudo curl -L "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
# sudo chmod +x /usr/local/bin/docker-compose
# docker-compose --version

- name: Build with Docker Compose
id: build
Expand All @@ -51,28 +41,13 @@ jobs:
IMAGE_TAG: ${{ github.sha }}
run: |
make build
- name: Log in to GitHub Container Registry
id: ghcr_login
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-region: eu-west-1
role-to-assume: arn:aws:iam::593291632749:role/github-actions-management-ecr
role-duration-seconds: 1200

# - name: Push
# id: push
# env:
# IMAGE_NAME: ghcr.io/ministryofjustice/analytics-platform-control-panel
# run: |
# docker push $IMAGE_NAME:${{ github.sha }}

- name: Run tests
env:
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ test-python: DJANGO_SETTINGS_MODULE=controlpanel.settings.test
test-python:
@echo
@echo "> Running Python Tests (In Docker)..."
@docker-compose run --rm -e KUBECONFIG=tests/kubeconfig frontend sh -c "pytest tests --color=yes"
@docker-compose run --rm -e KUBECONFIG=tests/kubeconfig \
frontend sh -c "pytest tests --color=yes"

## test: Run tests in Docker container
test: test-python
Expand Down

0 comments on commit 1b982f1

Please sign in to comment.