Skip to content

Commit

Permalink
Merge branch 'main' into relud-es-8-crash-storage
Browse files Browse the repository at this point in the history
  • Loading branch information
relud committed Nov 20, 2024
2 parents a830cbf + 52f5d8b commit c7457c8
Show file tree
Hide file tree
Showing 84 changed files with 729 additions and 2,162 deletions.
8 changes: 0 additions & 8 deletions .env

This file was deleted.

4 changes: 3 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ updates:
open-pull-requests-limit: 10

- package-ecosystem: "docker"
directory: "/docker"
directories:
- "/docker"
- "/docker/images/*"
schedule:
interval: "weekly"
open-pull-requests-limit: 10
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ jobs:
contents: read
deployments: write
id-token: write
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
# Disable docker compose volume mounts in docker-compose.override.yml
COMPOSE_FILE: docker-compose.yml
steps:
- uses: actions/checkout@v4
- name: Get info
Expand All @@ -36,20 +39,21 @@ jobs:
"$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" > version.json
- name: Output version.json
run: cat version.json
- name: Install just
run: sudo apt-get update && sudo apt-get install -y just
- name: Build Docker images
run: |
make build
just build
docker compose images
- name: Verify requirements.txt contains correct dependencies
run: |
docker run --rm local/socorro_app shell ./bin/verify_reqs.sh
just verify-reqs
- name: Run lint check
run: |
docker run --rm local/socorro_app shell ./bin/lint.sh
just lint
- name: Run tests
run: |
make my.env
docker compose run --rm test-ci shell ./bin/test.sh
just test
- name: Set Docker image tag to "latest" for updates of the main branch
if: github.ref == 'refs/heads/main'
Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ symbols/
.docker-build*
.devcontainer-build
.cache/
docker-compose.override.yml
my.env
.env

# docs things
docs/_build/
154 changes: 0 additions & 154 deletions Makefile

This file was deleted.

Loading

0 comments on commit c7457c8

Please sign in to comment.