diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 970dc2f..8b0674b 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -41,7 +41,7 @@ jobs: - name: Compress-manpage run: tar -czvf vso-man.tar.gz man/vso.1 - + - uses: actions/upload-artifact@v4 with: name: vso diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eae2d19..e8a200f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,10 +31,6 @@ jobs: runs-on: ubuntu-latest container: image: ghcr.io/vanilla-os/pico:main - permissions: - contents: write # to upload assets to releases - attestations: write # to upload assets attestation for build provenance - id-token: write # grant additional permission to attestation action to mint the OIDC token permission steps: - uses: actions/checkout@v4 @@ -51,15 +47,11 @@ jobs: - name: Build run: go build -o vso - - name: Compress package and manpage - run: | - tar -czvf vso.tar.gz vso - tar -czvf vso-man.tar.gz man/vso.1 + - name: Compress + run: tar -czvf vso.tar.gz vso - - name: Generate Checksums - run: | - sha256sum vso.tar.gz > vso.tar.gz.sha256 - sha256sum vso-man.tar.gz > vso.tar.gz.sha256 + - name: Compress-manpage + run: tar -czvf vso-man.tar.gz man/vso.1 - uses: softprops/action-gh-release@v2 with: @@ -67,14 +59,10 @@ jobs: files: | vso.tar.gz vso-man.tar.gz - vso.tar.gz.sha256 - vso.tar.gz.sha256 - + - name: Attest release files uses: actions/attest-build-provenance@v1 with: subject-path: | vso.tar.gz vso-man.tar.gz - vso.tar.gz.sha256 - vso.tar.gz.sha256 diff --git a/.goreleaser.yaml b/.goreleaser.yaml index fd7287d..0b01261 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,9 +1,37 @@ +before: + hooks: + - go mod tidy + - go generate ./... + +builds: + - env: + - CGO_ENABLED=0 + goos: + - linux + goarch: + - amd64 + ldflags: + - -s -w -X main.Version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.builtBy=goreleaser + +archives: + - format: tar.gz + name_template: >- + {{ .ProjectName }}_ + {{- title .Os }}_ + {{- if eq .Arch "amd64" }}x86_64 + {{- else if eq .Arch "386" }}i386 + {{- else }}{{ .Arch }}{{ end }} + {{- if .Arm }}v{{ .Arm }}{{ end }} + format_overrides: + - goos: windows + format: zip + +snapshot: + name_template: "{{ incpatch .Version }}-next" + changelog: sort: asc filters: exclude: - - '^docs:' + - '^wip:' - '^test:' - -release: - skip_upload: true diff --git a/cmd/waydroid.go b/cmd/waydroid.go index 053c8d5..13396a9 100644 --- a/cmd/waydroid.go +++ b/cmd/waydroid.go @@ -288,7 +288,7 @@ func wayInstallRemote(search string, noconfirm bool, noprompt bool) (string, cor _, err := os.Stat(core.APKCacheDir) if os.IsNotExist(err) { - err := os.MkdirAll(core.APKCacheDir, 0755) + err := os.MkdirAll(core.APKCacheDir, 0o755) if err != nil { return "", core.FdroidPackage{}, err } @@ -490,7 +490,7 @@ func wayRemove(cmd *cobra.Command, args []string) error { if err != nil { return err } - //defer db.Close() + // defer db.Close() if len(matches) == 1 { rem = matches[0] } else if len(matches) > 1 { diff --git a/locales/en.yml b/locales/en.yml index a6a373e..d6a8516 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -232,9 +232,9 @@ waydroid: cancelled: "Cancelled removal of subsystem." error: noArguments: "No arguments provided." - noRepos: "No repositories provided." + noRepos: "Could not find any repositories." notWayland: "This feature is only available on Wayland." - secureBoot: "This feature is only available when Secure Boot is disabled." + secureBoot: "This feature requires secure boot to be disabled in the BIOS." install: description: "Install an application" options: