Skip to content

Commit

Permalink
swap to releaser
Browse files Browse the repository at this point in the history
  • Loading branch information
Racer159 committed Dec 10, 2024
1 parent 9a48377 commit 549662f
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: Lint
on:
# This workflow is triggered on pull requests to the main branch.
pull_request:
# milestoned is added here as a workaround for release-please not triggering PR workflows (PRs should be added to a milestone to trigger the workflow).
# milestoned is added here as a way to retrigger workflows that are stuck or otherwise didn't run correctly
types: [milestoned, opened, reopened, synchronize]

# Permissions for the GITHUB_TOKEN used by the workflow.
Expand Down
17 changes: 2 additions & 15 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,11 @@ permissions:
id-token: write

jobs:
tag-new-version:
permissions: write-all
runs-on: ubuntu-latest
outputs:
release_created: ${{ steps.release-flag.outputs.release_created }}
steps:
- name: Create Release Tag
id: tag
uses: googleapis/release-please-action@7987652d64b4581673a76e33ad5e98e3dd56832f # v4.1.3
- id: release-flag
run: echo "release_created=${{ steps.tag.outputs.release_created || false }}" >> "$GITHUB_OUTPUT"

publish:
permissions:
contents: read # Allows reading the content of the repository.
contents: write # Allows reading the content of the repository.
packages: write # Allows reading the content of the repository's packages.
id-token: write
needs: tag-new-version
if: ${{ needs.tag-new-version.outputs.release_created == 'true' }}
strategy:
matrix:
flavor: [upstream, registry1, unicorn]
Expand All @@ -45,4 +31,5 @@ jobs:
with:
flavor: ${{ matrix.flavor }}
runsOn: ${{ matrix.architecture == 'arm64' && 'uds-swf-ubuntu-arm64-4-core' || 'ubuntu-latest' }}
uds-releaser: true
secrets: inherit # Inherits all secrets from the parent workflow.
5 changes: 2 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: Test
on:
# This workflow is triggered on pull requests to the main branch.
pull_request:
# milestoned is added here as a workaround for release-please not triggering PR workflows (PRs should be added to a milestone to trigger the workflow).
# milestoned is added here as a way to retrigger workflows that are stuck or otherwise didn't run correctly
types: [milestoned, opened, reopened, synchronize]
paths-ignore:
- "**.md"
Expand All @@ -18,8 +18,7 @@ on:
- docs/**
- .gitignore
- renovate.json
- .release-please-config.json
- release-please-config.json
- releaser.yaml
- CODEOWNERS
- LICENSE
- CONTRIBUTING.md
Expand Down
3 changes: 0 additions & 3 deletions .release-please-manifest.json

This file was deleted.

8 changes: 2 additions & 6 deletions bundle/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@ kind: UDSBundle
metadata:
name: postgres-operator-test
description: A UDS bundle for deploying Zalando Postgres Operator and on a development cluster
# x-release-please-start-version
version: 1.13.0-uds.5
# x-release-please-end
version: dev

packages:
- name: postgres-operator
path: ../
# x-release-please-start-version
ref: 1.13.0-uds.5
# x-release-please-end
ref: dev
overrides:
postgres-operator:
uds-postgres-config:
Expand Down
24 changes: 0 additions & 24 deletions release-please-config.json

This file was deleted.

13 changes: 13 additions & 0 deletions releaser.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Copyright 2024 Defense Unicorns
# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial

flavors:
- name: upstream
# renovate-uds: datasource=docker depName=ghcr.io/zalando/postgres-operator extractVersion=^v?(?<version>\d+\.\d+\.\d+)$
version: 1.13.0-uds.6
- name: registry1
# renovate-uds: datasource=docker depName=registry1.dso.mil/ironbank/opensource/zalando/postgres-operator extractVersion=^v?(?<version>\d+\.\d+\.\d+)$
version: 1.13.0-uds.6
- name: unicorn
# renovate-uds: datasource=docker depName=cgr.dev/du-uds-defenseunicorns/postgres-operator-fips
version: 1.13.0-uds.6
4 changes: 0 additions & 4 deletions tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,3 @@ tasks:
- task: create-deploy-test-bundle
- description: Publish the package
task: publish:package
with:
# x-release-please-start-version
version: "1.13.0-uds.5"
# x-release-please-end
1 change: 0 additions & 1 deletion version.txt

This file was deleted.

4 changes: 1 addition & 3 deletions zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ metadata:
name: postgres-operator
description: "A deployment of zalando postgres operator"
url: https://github.com/zalando/postgres-operator
# x-release-please-start-version
version: "1.13.0-uds.5"
# x-release-please-end
version: "dev"

components:
# CRD lifecycle is managed outside of the main chart to support upgrades
Expand Down

0 comments on commit 549662f

Please sign in to comment.