diff --git a/.github/workflows/mirror.yaml b/.github/workflows/mirror.yaml deleted file mode 100644 index 352ed37..0000000 --- a/.github/workflows/mirror.yaml +++ /dev/null @@ -1,28 +0,0 @@ -name: mirror -on: - push: - branches: [main] - tags: ["*"] - -jobs: - gitlab-com: - runs-on: ubuntu-latest - env: - REMOTE: mirror - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - # Need all to fetch all tags so we can push them - fetch-depth: 0 - - - name: Add Remote - env: - CLONE_URL: "https://releaser-pleaser:${{ secrets.GITLAB_COM_PUSH_TOKEN }}@gitlab.com/apricote/releaser-pleaser.git" - run: git remote add $REMOTE $CLONE_URL - - - name: Push Branches - run: git push --force --all --verbose $REMOTE - - - name: Push Tags - run: git push --force --tags --verbose $REMOTE diff --git a/.github/workflows/releaser-pleaser.yaml b/.github/workflows/releaser-pleaser.yaml index 543c557..ff1c0fa 100644 --- a/.github/workflows/releaser-pleaser.yaml +++ b/.github/workflows/releaser-pleaser.yaml @@ -43,4 +43,3 @@ jobs: token: ${{ secrets.RELEASER_PLEASER_TOKEN }} extra-files: | action.yml - templates/run.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 742be9d..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,15 +0,0 @@ -stages: [release] - -# For the GitLab CI/CD component to be usable, it needs to be published in -# the CI/CD catalog. This happens on new releases. -# As the primary tagging happens on GitHub, we only react to pushed tags -# and create a corresponding GitLab Release. -create-release: - stage: release - image: registry.gitlab.com/gitlab-org/release-cli:latest - script: echo "Creating release $CI_COMMIT_TAG" - rules: - - if: $CI_COMMIT_TAG - release: - tag_name: "$CI_COMMIT_TAG" - description: "$CI_COMMIT_TAG_MESSAGE" diff --git a/.ko.yaml b/.ko.yaml index 49805d6..c7c0e49 100644 --- a/.ko.yaml +++ b/.ko.yaml @@ -1,6 +1,3 @@ defaultPlatforms: - linux/arm64 - - linux/amd64 - -# Need a shell for gitlab-ci -defaultBaseImage: cgr.dev/chainguard/busybox + - linux/amd64 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f187be..eb47b20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,28 +1,5 @@ # Changelog -## [v0.4.0-beta.1](https://github.com/apricote/releaser-pleaser/releases/tag/v0.4.0-beta.1) - -### Features - -- add shell to container image (#59) -- **gitlab**: add CI/CD component (#55) - -### Bug Fixes - -- multiple extra-files are not evaluated properly (#61) - -## [v0.4.0-beta.0](https://github.com/apricote/releaser-pleaser/releases/tag/v0.4.0-beta.0) - -### Features - -- add support for GitLab repositories (#49) - -### Bug Fixes - -- **parser**: continue on unparsable commit message (#48) -- **cli**: command name in help output (#52) -- **parser**: invalid handling of empty lines (#53) - ## [v0.3.0](https://github.com/apricote/releaser-pleaser/releases/tag/v0.3.0) ### :sparkles: Highlights diff --git a/action.yml b/action.yml index 15c82df..8e3b8e1 100644 --- a/action.yml +++ b/action.yml @@ -21,12 +21,12 @@ inputs: outputs: {} runs: using: 'docker' - image: ghcr.io/apricote/releaser-pleaser:v0.4.0-beta.1 # x-releaser-pleaser-version + image: ghcr.io/apricote/releaser-pleaser:v0.3.0 # x-releaser-pleaser-version args: - run - --forge=github - --branch=${{ inputs.branch }} - - --extra-files="${{ inputs.extra-files }}" + - --extra-files=${{ inputs.extra-files }} env: - GITHUB_TOKEN: "${{ inputs.token }}" + GITHUB_TOKEN: ${{ inputs.token }} GITHUB_USER: "oauth2" diff --git a/cmd/rp/cmd/run.go b/cmd/rp/cmd/run.go index c29047b..8fe818f 100644 --- a/cmd/rp/cmd/run.go +++ b/cmd/rp/cmd/run.go @@ -95,12 +95,6 @@ func run(cmd *cobra.Command, _ []string) error { } func parseExtraFiles(input string) []string { - // We quote the arg to avoid issues with the expected newlines in the value. - // Need to remove those quotes before parsing the data - input = strings.Trim(input, `"`) - // In some situations we get a "\n" sequence, where we actually expect new lines, - // replace the two characters with an actual new line - input = strings.ReplaceAll(input, `\n`, "\n") lines := strings.Split(input, "\n") extraFiles := make([]string, 0, len(lines)) diff --git a/cmd/rp/cmd/run_test.go b/cmd/rp/cmd/run_test.go deleted file mode 100644 index d4cea7a..0000000 --- a/cmd/rp/cmd/run_test.go +++ /dev/null @@ -1,59 +0,0 @@ -package cmd - -import ( - "testing" - - "github.com/stretchr/testify/assert" -) - -func Test_parseExtraFiles(t *testing.T) { - tests := []struct { - name string - input string - want []string - }{ - { - name: "empty", - input: ``, - want: []string{}, - }, - { - name: "empty quoted", - input: `""`, - want: []string{}, - }, - { - name: "single", - input: `foo.txt`, - want: []string{"foo.txt"}, - }, - { - name: "single quoted", - input: `"foo.txt"`, - want: []string{"foo.txt"}, - }, - { - name: "multiple", - input: `foo.txt -dir/Chart.yaml`, - want: []string{"foo.txt", "dir/Chart.yaml"}, - }, - { - name: "multiple quoted", - input: `"foo.txt -dir/Chart.yaml"`, - want: []string{"foo.txt", "dir/Chart.yaml"}, - }, - { - name: "multiple with broken new lines", - input: `"action.yml\ntemplates/run.yml\n"`, - want: []string{"action.yml", "templates/run.yml"}, - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - got := parseExtraFiles(tt.input) - assert.Equal(t, tt.want, got) - }) - } -} diff --git a/templates/run.yml b/templates/run.yml deleted file mode 100644 index bd762be..0000000 --- a/templates/run.yml +++ /dev/null @@ -1,36 +0,0 @@ -spec: - inputs: - # Remember to update docs/reference/gitlab-ci-component.md - branch: - default: main - description: "This branch is used as the target for releases." - - token: - description: "GitLab token for creating and updating release MRs." - - extra-files: - description: 'List of files that are scanned for version references.' - default: "" - - stage: - default: build - description: 'Defines the build stage' - # Remember to update docs/reference/gitlab-ci-component.md ---- - -releaser-pleaser: - stage: $[[ inputs.stage ]] - rules: - # There is no way to run a pipeline when the MR description is updated :( - - if: $CI_COMMIT_BRANCH == "$[[ inputs.branch ]]" - image: - name: ghcr.io/apricote/releaser-pleaser:v0.4.0-beta.1 # x-releaser-pleaser-version - entrypoint: [""] - variables: - GITLAB_TOKEN: $[[ inputs.token ]] - script: - - | - rp run \ - --forge=gitlab \ - --branch=$[[ inputs.branch ]] \ - --extra-files="$[[ inputs.extra-files ]]"