diff --git a/.github/workflows/docker-build-staging-prod.yaml b/.github/workflows/docker-build-staging-prod.yaml index cb4def1ae..f4408da66 100644 --- a/.github/workflows/docker-build-staging-prod.yaml +++ b/.github/workflows/docker-build-staging-prod.yaml @@ -13,4 +13,4 @@ jobs: with: envs: staging,prod path_filters: '!.infra/**,apiv2/**' - branches: release-please--branches--main + branches_include: release-please--branches--main diff --git a/.github/workflows/workflow-argus-docker-build.yaml b/.github/workflows/workflow-argus-docker-build.yaml index 587f472d8..9e5b873da 100644 --- a/.github/workflows/workflow-argus-docker-build.yaml +++ b/.github/workflows/workflow-argus-docker-build.yaml @@ -11,7 +11,7 @@ on: description: 'Glob patterns to match against changed files in the repository, comma delimited' required: true type: string - branches: + branches_include: description: 'Branches to build on, comma delimited' required: false type: string @@ -27,16 +27,15 @@ jobs: uses: chanzuckerberg/github-actions/.github/workflows/argus-docker-build.yaml@v3.1.0 secrets: inherit with: - branches: ${{ inputs.branches }} + branches_include: ${{ inputs.branches_include }} branches_ignore: ${{ inputs.branches_ignore }} path_filters: ${{ inputs.path_filters }} envs: ${{ inputs.envs }} images: | - [ - { + { "apiv2": { "name": "apiv2", "context": "apiv2", "dockerfile": "apiv2/Dockerfile", "platform": "linux/arm64" } - ] + } diff --git a/apiv2/README.md b/apiv2/README.md index 309dbb72e..b32b8b18e 100644 --- a/apiv2/README.md +++ b/apiv2/README.md @@ -13,5 +13,10 @@ After the above steps, browse the api at [http://localhost:9009/graphql](http:// ``` # First, make any necessary changes to apiv2/schema/schema.yaml, then run this to generate new code & migrations and apply them: +cd apiv2 make update-schema +# Then, from the root of the repo, run: +cd .. +pre-commit run --all-files +# Then commit all changed files, *including* any new migrations! ```