diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 15225ee..ab72f35 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -33,4 +33,5 @@ jobs: - name: Autobuild uses: github/codeql-action/autobuild@v2 - name: Perform CodeQL Analysis + if: ${{ !startsWith(github.event.head_commit.message, 'Release') }} uses: github/codeql-action/analyze@v2 diff --git a/Makefile b/Makefile index cc45e00..7801a40 100644 --- a/Makefile +++ b/Makefile @@ -33,8 +33,8 @@ release: git add .slsa-goreleaser.yml git commit -m "Release: finish releasing v0.`cat VERSION`" --no-verify # Push to trigger the releases - #git push - #git push --tags + git push + git push --tags build-static: docker build -t gcr.io/dworken-k8s/hishtory-static -f backend/web/caddy/Dockerfile . diff --git a/backend/server/server.go b/backend/server/server.go index 91e251c..eb7b2d3 100644 --- a/backend/server/server.go +++ b/backend/server/server.go @@ -241,9 +241,13 @@ func InitDB() { func apiDownloadHandler(w http.ResponseWriter, r *http.Request) { updateInfo := shared.UpdateInfo{ - LinuxAmd64Url: fmt.Sprintf("https://github.com/ddworken/hishtory/releases/download/%s/hishtory-linux-amd64", ReleaseVersion), - LinuxAmd64AttestationUrl: fmt.Sprintf("https://github.com/ddworken/hishtory/releases/download/%s/hishtory-linux-amd64.intoto.jsonl", ReleaseVersion), - Version: ReleaseVersion, + LinuxAmd64Url: fmt.Sprintf("https://github.com/ddworken/hishtory/releases/download/%s/hishtory-linux-amd64", ReleaseVersion), + LinuxAmd64AttestationUrl: fmt.Sprintf("https://github.com/ddworken/hishtory/releases/download/%s/hishtory-linux-amd64.intoto.jsonl", ReleaseVersion), + DarwinAmd64Url: fmt.Sprintf("https://github.com/ddworken/hishtory/releases/download/%s/hishtory-darwin-amd64", ReleaseVersion), + DarwinAmd64AttestationUrl: fmt.Sprintf("https://github.com/ddworken/hishtory/releases/download/%s/hishtory-darwin-amd64.intoto.jsonl", ReleaseVersion), + DarwinArm64Url: fmt.Sprintf("https://github.com/ddworken/hishtory/releases/download/%s/hishtory-darwin-arm64", ReleaseVersion), + DarwinArm64AttestationUrl: fmt.Sprintf("https://github.com/ddworken/hishtory/releases/download/%s/hishtory-darwin-arm64.intoto.jsonl", ReleaseVersion), + Version: ReleaseVersion, } resp, err := json.Marshal(updateInfo) if err != nil { diff --git a/shared/data.go b/shared/data.go index 4284bb0..b7c885f 100644 --- a/shared/data.go +++ b/shared/data.go @@ -26,9 +26,13 @@ type Device struct { } type UpdateInfo struct { - LinuxAmd64Url string `json:"linux_amd_64_url"` - LinuxAmd64AttestationUrl string `json:"linux_amd_64_attestation_url"` - Version string `json:"version"` + LinuxAmd64Url string `json:"linux_amd_64_url"` + LinuxAmd64AttestationUrl string `json:"linux_amd_64_attestation_url"` + DarwinAmd64Url string `json:"darwin_amd_64_url"` + DarwinAmd64AttestationUrl string `json:"darwin_amd_64_attestation_url"` + DarwinArm64Url string `json:"darwin_arm_64_url"` + DarwinArm64AttestationUrl string `json:"darwin_arm_64_attestation_url"` + Version string `json:"version"` } const (