diff --git a/.github/workflows/releaser-pleaser.yaml b/.github/workflows/releaser-pleaser.yaml index 7fb4b81..0406d41 100644 --- a/.github/workflows/releaser-pleaser.yaml +++ b/.github/workflows/releaser-pleaser.yaml @@ -3,6 +3,7 @@ name: releaser-pleaser on: push: branches: [main] + # TODO: use pull_request_target to avoid tainting the actual release PR with code from open feature pull requests pull_request: types: - edited @@ -18,6 +19,21 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Set up Go + uses: actions/setup-go@v5 + with: + go-version-file: go.mod + + # Build container image from current commit and replace image ref in `action.yml` + # Without this, any new flags in `action.yml` would break the job in this repository until the new + # version is released. But a new version can only be released if this job works. + - uses: ko-build/setup-ko@v0.7 + - run: ko build --bare --local --tags ci github.com/apricote/releaser-pleaser/cmd/rp + + - run: mkdir -p .github/actions/releaser-pleaser + - run: "sed -i 's|image: .*$|image: ghcr.io/apricote/releaser-pleaser:ci|g' action.yml" + + # Dogfood the action to make sure it works for users. - name: releaser-pleaser uses: ./ with: diff --git a/cmd/rp/cmd/root.go b/cmd/rp/cmd/root.go index c43b75a..be92187 100644 --- a/cmd/rp/cmd/root.go +++ b/cmd/rp/cmd/root.go @@ -1,31 +1,45 @@ package cmd import ( + "fmt" "log/slog" "os" + "runtime/debug" "github.com/spf13/cobra" ) var logger *slog.Logger -// rootCmd represents the base command when called without any subcommands var rootCmd = &cobra.Command{ - Use: "releaser-pleaser", - Short: "A brief description of your application", - Long: `A longer description that spans multiple lines and likely contains -examples and usage of using your application. For example: - -Cobra is a CLI library for Go that empowers applications. -This application is a tool to generate the needed files -to quickly create a Cobra application.`, - // Uncomment the following line if your bare application - // has an action associated with it: - // Run: func(cmd *cobra.Command, args []string) { }, + Use: "releaser-pleaser", + Short: "", + Long: ``, + Version: version(), +} + +func version() string { + vcsrevision := "unknown" + vcsdirty := "" + + buildInfo, ok := debug.ReadBuildInfo() + if ok { + fmt.Println(buildInfo.String()) + for _, setting := range buildInfo.Settings { + switch setting.Key { + case "vcs.revision": + vcsrevision = setting.Value + case "vcs.modified": + if setting.Value == "true" { + vcsdirty = " (dirty)" + } + } + } + } + + return vcsrevision + vcsdirty } -// Execute adds all child commands to the root command and sets flags appropriately. -// This is called by main.main(). It only needs to happen once to the rootCmd. func Execute() { err := rootCmd.Execute() if err != nil { @@ -38,13 +52,4 @@ func init() { Level: slog.LevelDebug, })) - // Here you will define your flags and configuration settings. - // Cobra supports persistent flags, which, if defined here, - // will be global for your application. - - // rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.releaser-pleaser.yaml)") - - // Cobra also supports local flags, which will only run - // when this action is called directly. - rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") } diff --git a/cmd/rp/cmd/run.go b/cmd/rp/cmd/run.go index 7661af5..7d5862b 100644 --- a/cmd/rp/cmd/run.go +++ b/cmd/rp/cmd/run.go @@ -8,7 +8,6 @@ import ( rp "github.com/apricote/releaser-pleaser" ) -// runCmd represents the run command var runCmd = &cobra.Command{ Use: "run", RunE: run, @@ -25,8 +24,6 @@ var ( func init() { rootCmd.AddCommand(runCmd) - // Here you will define your flags and configuration settings. - runCmd.PersistentFlags().StringVar(&flagForge, "forge", "", "") runCmd.PersistentFlags().StringVar(&flagBranch, "branch", "main", "") runCmd.PersistentFlags().StringVar(&flagOwner, "owner", "", "")