Skip to content

Commit

Permalink
Merge branch 'main' into ipld
Browse files Browse the repository at this point in the history
  • Loading branch information
notlelouch authored Oct 22, 2024
2 parents 1755140 + 8169508 commit 3fd1913
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 16 deletions.
17 changes: 15 additions & 2 deletions .github/workflows/ci_release.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
name: CI and Release

on:
merge_group:
push:
branches:
- main
tags:
- '**'
release:
types: [published]
pull_request:
workflow_dispatch:
inputs:
version:
version-bump:
# Friendly description to be shown in the UI instead of 'name'
description: "Semver type of new version (major / minor / patch)"
# Input has to be provided for the workflow to run
Expand All @@ -19,6 +22,9 @@ on:
- patch
- minor
- major
tag-as:
description: 'Tag for snapshot release (optional)'
required: false

jobs:
# set up go version for use through pipelines, setting
Expand Down Expand Up @@ -101,7 +107,7 @@ jobs:
uses: mathieudutour/[email protected]
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
default_bump: ${{ inputs.version }}
default_bump: ${{ inputs.version-bump }}
release_branches: ${{ needs.setup.outputs.branch }}

# Generate the release with goreleaser to include pre-built binaries
Expand All @@ -121,6 +127,13 @@ jobs:
with:
go-version: ${{ needs.setup.outputs.go-version }}

- name: Bump version and push tag
if: ${{ github.event_name == 'workflow_dispatch' }} && ${{ inputs.tag-as }} != ''
uses: mathieudutour/[email protected]
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
custom_tag: ${{ inputs.tag-as }}

- name: Import GPG key
id: import_gpg
uses: crazy-max/ghaction-import-gpg@v6
Expand Down
14 changes: 0 additions & 14 deletions .github/workflows/create_release_tracking_epic.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
version: 2
# This is an example .goreleaser.yml file with some sensible defaults.
# Make sure to check the documentation at https://goreleaser.com
before:
Expand Down Expand Up @@ -67,5 +68,6 @@ changelog:
- "^test:"
release:
prerelease: auto
mode: keep-existing
git:
prerelease_suffix: "-rc*"

0 comments on commit 3fd1913

Please sign in to comment.