Skip to content

Commit

Permalink
Remove old actions and use new build scripts (#1658)
Browse files Browse the repository at this point in the history
  • Loading branch information
ahosgood authored Jun 21, 2024
1 parent 65a4eb3 commit 3a8e2a8
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 246 deletions.
69 changes: 0 additions & 69 deletions .github/actions/docker-build/action.yml

This file was deleted.

21 changes: 0 additions & 21 deletions .github/actions/get-version-tag/action.yml

This file was deleted.

27 changes: 0 additions & 27 deletions .github/actions/install-aws/action.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/branch-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v4
- name: Get tag
id: version-tag
uses: ./.github/actions/get-version-tag
run: echo "VERSION=$(echo "${{ github.event.ref }}" | sed -e 's,/,-,g')" >> "$GITHUB_OUTPUT"
- name: Debug
run: echo "Clean up Docker image ${{ vars.DOCKER_IMAGE_NAME }}:${{ steps.version-tag.outputs.VERSION }}"
- name: Delete image
Expand Down
32 changes: 0 additions & 32 deletions .github/workflows/cd-feature.yml

This file was deleted.

34 changes: 0 additions & 34 deletions .github/workflows/cd-main.yml

This file was deleted.

47 changes: 47 additions & 0 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Build and deploy

on:
workflow_dispatch:
push:
release:
types:
- published

concurrency:
group: cd-${{ github.ref }}

jobs:
test:
name: Tests
uses: ./.github/workflows/_tests.yml
with:
python-version: ${{ vars.CI_PYTHON_VERSION }}
poetry-version: ${{ vars.CI_POETRY_VERSION }}

version:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Get tag
id: version-tag
uses: nationalarchives/ds-docker-actions/.github/actions/get-version-tag@main
outputs:
version: ${{ steps.version-tag.outputs.version-tag }}

build:
runs-on: ubuntu-latest
needs:
- test
- version
permissions:
packages: write
contents: read
steps:
- uses: actions/checkout@v4
- name: Build Docker image
uses: nationalarchives/ds-docker-actions/.github/actions/docker-build@main
with:
version: ${{ needs.version.outputs.version }}
latest: ${{ github.ref == 'refs/heads/main' }}
github-token: ${{ secrets.GITHUB_TOKEN }}
docker-image-name: ${{ vars.DOCKER_IMAGE_NAME }}
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml → .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
name: CI
name: Pull request

on:
pull_request:
types:
- opened
- synchronize

jobs:
ci:
Expand Down
32 changes: 0 additions & 32 deletions .github/workflows/release.yml

This file was deleted.

29 changes: 0 additions & 29 deletions .github/workflows/remove-untagged.yml

This file was deleted.

0 comments on commit 3a8e2a8

Please sign in to comment.