From b591a23f5e7bf369c859693095953b3844410dc4 Mon Sep 17 00:00:00 2001 From: David Dworken Date: Fri, 4 Nov 2022 20:57:28 -0700 Subject: [PATCH] Reorganize slsa config files + attempt to build for freebsd + windows --- .../slsa/.slsa-goreleaser-darwin-amd64.yml | 0 .../slsa/.slsa-goreleaser-darwin-arm64.yml | 0 .../slsa/.slsa-goreleaser-freebsd-amd64.yml | 15 ++++++++++ .../slsa/.slsa-goreleaser-linux-amd64.yml | 0 .../slsa/.slsa-goreleaser-windows-amd64.yml | 15 ++++++++++ .github/workflows/slsa-releaser.yml | 30 +++++++++++++++++-- 6 files changed, 57 insertions(+), 3 deletions(-) rename .slsa-goreleaser-darwin-amd64.yml => .github/slsa/.slsa-goreleaser-darwin-amd64.yml (100%) rename .slsa-goreleaser-darwin-arm64.yml => .github/slsa/.slsa-goreleaser-darwin-arm64.yml (100%) create mode 100644 .github/slsa/.slsa-goreleaser-freebsd-amd64.yml rename .slsa-goreleaser-linux-amd64.yml => .github/slsa/.slsa-goreleaser-linux-amd64.yml (100%) create mode 100644 .github/slsa/.slsa-goreleaser-windows-amd64.yml diff --git a/.slsa-goreleaser-darwin-amd64.yml b/.github/slsa/.slsa-goreleaser-darwin-amd64.yml similarity index 100% rename from .slsa-goreleaser-darwin-amd64.yml rename to .github/slsa/.slsa-goreleaser-darwin-amd64.yml diff --git a/.slsa-goreleaser-darwin-arm64.yml b/.github/slsa/.slsa-goreleaser-darwin-arm64.yml similarity index 100% rename from .slsa-goreleaser-darwin-arm64.yml rename to .github/slsa/.slsa-goreleaser-darwin-arm64.yml diff --git a/.github/slsa/.slsa-goreleaser-freebsd-amd64.yml b/.github/slsa/.slsa-goreleaser-freebsd-amd64.yml new file mode 100644 index 0000000..922f476 --- /dev/null +++ b/.github/slsa/.slsa-goreleaser-freebsd-amd64.yml @@ -0,0 +1,15 @@ +version: 1 + +env: + - CGO_ENABLED=0 + +flags: + - -trimpath + +goos: freebsd +goarch: amd64 + +binary: hishtory-{{ .Os }}-{{ .Arch }} + +ldflags: + - '{{ .Env.VERSION_LDFLAGS }}' diff --git a/.slsa-goreleaser-linux-amd64.yml b/.github/slsa/.slsa-goreleaser-linux-amd64.yml similarity index 100% rename from .slsa-goreleaser-linux-amd64.yml rename to .github/slsa/.slsa-goreleaser-linux-amd64.yml diff --git a/.github/slsa/.slsa-goreleaser-windows-amd64.yml b/.github/slsa/.slsa-goreleaser-windows-amd64.yml new file mode 100644 index 0000000..922f476 --- /dev/null +++ b/.github/slsa/.slsa-goreleaser-windows-amd64.yml @@ -0,0 +1,15 @@ +version: 1 + +env: + - CGO_ENABLED=0 + +flags: + - -trimpath + +goos: freebsd +goarch: amd64 + +binary: hishtory-{{ .Os }}-{{ .Arch }} + +ldflags: + - '{{ .Env.VERSION_LDFLAGS }}' diff --git a/.github/workflows/slsa-releaser.yml b/.github/workflows/slsa-releaser.yml index 542d0ab..c5481e2 100644 --- a/.github/workflows/slsa-releaser.yml +++ b/.github/workflows/slsa-releaser.yml @@ -31,7 +31,31 @@ jobs: needs: args uses: slsa-framework/slsa-github-generator/.github/workflows/builder_go_slsa3.yml@v1.2.1 with: - config-file: .slsa-goreleaser-linux-amd64.yml + config-file: .github/slsa/.slsa-goreleaser-linux-amd64.yml + go-version: 1.18 + evaluated-envs: "VERSION_LDFLAGS:${{needs.args.outputs.ldflags}}" + compile-builder: true # See github.com/slsa-framework/slsa-github-generator/issues/942 + build-freebsd-amd64: + permissions: + id-token: write + contents: write + actions: read + needs: args + uses: slsa-framework/slsa-github-generator/.github/workflows/builder_go_slsa3.yml@v1.2.1 + with: + config-file: .github/slsa/.slsa-goreleaser-freebsd-amd64.yml + go-version: 1.18 + evaluated-envs: "VERSION_LDFLAGS:${{needs.args.outputs.ldflags}}" + compile-builder: true # See github.com/slsa-framework/slsa-github-generator/issues/942 + build-windows-amd64: + permissions: + id-token: write + contents: write + actions: read + needs: args + uses: slsa-framework/slsa-github-generator/.github/workflows/builder_go_slsa3.yml@v1.2.1 + with: + config-file: .github/slsa/.slsa-goreleaser-windows-amd64.yml go-version: 1.18 evaluated-envs: "VERSION_LDFLAGS:${{needs.args.outputs.ldflags}}" compile-builder: true # See github.com/slsa-framework/slsa-github-generator/issues/942 @@ -44,7 +68,7 @@ jobs: - args uses: slsa-framework/slsa-github-generator/.github/workflows/builder_go_slsa3.yml@v1.2.1 with: - config-file: .slsa-goreleaser-darwin-amd64.yml + config-file: .github/slsa/.slsa-goreleaser-darwin-amd64.yml go-version: 1.18 evaluated-envs: "VERSION_LDFLAGS:${{needs.args.outputs.ldflags}}" compile-builder: true # See github.com/slsa-framework/slsa-github-generator/issues/942 @@ -57,7 +81,7 @@ jobs: - args uses: slsa-framework/slsa-github-generator/.github/workflows/builder_go_slsa3.yml@v1.2.1 with: - config-file: .slsa-goreleaser-darwin-arm64.yml + config-file: .github/slsa/.slsa-goreleaser-darwin-arm64.yml go-version: 1.18 evaluated-envs: "VERSION_LDFLAGS:${{needs.args.outputs.ldflags}}" compile-builder: true # See github.com/slsa-framework/slsa-github-generator/issues/942