diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 4c191f520..e1d615205 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -188,19 +188,3 @@ jobs: # Remove old build runs, build pods and deployment pods oc delete po --field-selector=status.phase==Succeeded - - ghcr-cleanup: - name: GHCR Cleanup - runs-on: ubuntu-latest - strategy: - matrix: - name: [database, migrations, backend, frontend] - timeout-minutes: 1 - steps: - - name: Keep last 50 - uses: actions/delete-package-versions@v4 - with: - package-name: "${{ github.event.repository.name }}/${{ matrix.name }}" - package-type: "container" - min-versions-to-keep: 50 - ignore-versions: "^(prod|test)$" diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index 1dbe65670..2a556724a 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -56,7 +56,6 @@ jobs: triggers: ('database/') - package: migrations build_context: ./backend/db - build_file: ./backend/db/Dockerfile triggers: ('backend/db') - package: backend triggers: ('backend/') @@ -64,15 +63,15 @@ jobs: triggers: ('frontend/') timeout-minutes: 10 steps: - - uses: bcgov-nr/action-builder-ghcr@v1.2.1 + - uses: bcgov-nr/action-builder-ghcr@v1.3.0 with: + keep_versions: 50 package: ${{ matrix.package }} tag: ${{ github.event.number }} tag_fallback: test token: ${{ secrets.GITHUB_TOKEN }} triggers: ${{ matrix.triggers }} build_context: ${{ matrix.build_context }} - build_file: ${{ matrix.build_file }} # https://github.com/bcgov-nr/action-deployer-openshift deploys: