From 5b93209aac604c57981db099ca2cc163c677cb4c Mon Sep 17 00:00:00 2001 From: LinkLeong Date: Fri, 4 Aug 2023 11:16:17 +0100 Subject: [PATCH] Update goreleaser --- .github/workflows/push_test_server.yml | 2 +- .goreleaser.yaml | 22 ++++++++++++++++------ drivers/onedrive/util.go | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.github/workflows/push_test_server.yml b/.github/workflows/push_test_server.yml index 0c46082..03e5966 100644 --- a/.github/workflows/push_test_server.yml +++ b/.github/workflows/push_test_server.yml @@ -44,7 +44,7 @@ jobs: with: # either 'goreleaser' (default) or 'goreleaser-pro' distribution: goreleaser - version: 1.14.1 + version: latest args: release --rm-dist --snapshot env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 43289ec..ab36e56 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -46,6 +46,12 @@ builds: ldflags: - -X main.commit={{.Commit}} - -X main.date={{.Date}} + - -X github.com/IceWhaleTech/CasaOS/drivers/google_drive.client_id={{.Env.GoogleID}} + - -X github.com/IceWhaleTech/CasaOS/drivers/google_drive.client_secret={{.Env.GoogleSecret}} + - -X github.com/IceWhaleTech/CasaOS/drivers/onedrive.client_id={{.Env.OneDreiveID}} + - -X github.com/IceWhaleTech/CasaOS/drivers/onedrive.client_secret={{.Env.OneDeriveSecret}} + - -X github.com/IceWhaleTech/CasaOS/drivers/dropbox.app_key={{.Env.DropboxKey}} + - -X github.com/IceWhaleTech/CasaOS/drivers/dropbox.app_secret={{.Env.DropboxSecret}} - -s - -w - -extldflags "-static" @@ -67,6 +73,12 @@ builds: ldflags: - -X main.commit={{.Commit}} - -X main.date={{.Date}} + - -X github.com/IceWhaleTech/CasaOS/drivers/google_drive.client_id={{.Env.GoogleID}} + - -X github.com/IceWhaleTech/CasaOS/drivers/google_drive.client_secret={{.Env.GoogleSecret}} + - -X github.com/IceWhaleTech/CasaOS/drivers/onedrive.client_id={{.Env.OneDreiveID}} + - -X github.com/IceWhaleTech/CasaOS/drivers/onedrive.client_secret={{.Env.OneDeriveSecret}} + - -X github.com/IceWhaleTech/CasaOS/drivers/dropbox.app_key={{.Env.DropboxKey}} + - -X github.com/IceWhaleTech/CasaOS/drivers/dropbox.app_secret={{.Env.DropboxSecret}} - -s - -w - -extldflags "-static" @@ -149,24 +161,22 @@ builds: goarm: - "7" archives: - - name_template: "{{ .Os }}-{{ .Arch }}-{{ .ProjectName }}-v{{ .Version }}" + - name_template: >- + {{ .Os }}-{{- if eq .Arch "arm" }}arm-7{{- else }}{{ .Arch }}{{- end }}-{{ .ProjectName }}-v{{ .Version }} id: casaos builds: - casaos-amd64 - casaos-arm64 - casaos-arm-7 - replacements: - arm: arm-7 files: - build/**/* - - name_template: "{{ .Os }}-{{ .Arch }}-{{ .ProjectName }}-migration-tool-v{{ .Version }}" + - name_template: >- + {{ .Os }}-{{- if eq .Arch "arm" }}arm-7{{- else }}{{ .Arch }}{{- end }}-{{ .ProjectName }}-migration-tool-v{{ .Version }} id: casaos-migration-tool builds: - casaos-migration-tool-amd64 - casaos-migration-tool-arm64 - casaos-migration-tool-arm-7 - replacements: - arm: arm-7 files: - build/sysroot/etc/**/* checksum: diff --git a/drivers/onedrive/util.go b/drivers/onedrive/util.go index 1dc5026..2f79cdd 100644 --- a/drivers/onedrive/util.go +++ b/drivers/onedrive/util.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/IceWhaleTech/CasaOS-Common/utils/logger" - "github.com/IceWhaleTech/IceWhale-Files/driver/base" + "github.com/IceWhaleTech/CasaOS/drivers/base" "go.uber.org/zap" )