From db61ce1d97b450c6c9f6710b2a12a3979dd3af32 Mon Sep 17 00:00:00 2001 From: AoiKamishiro Date: Thu, 5 Mar 2026 16:51:44 +0900 Subject: [PATCH] =?UTF-8?q?update:=20go=E3=81=A8=E3=83=AA=E3=83=AA?= =?UTF-8?q?=E3=83=BC=E3=82=B9=E6=89=8B=E9=A0=86=E3=81=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 17 +++++++++-------- go.mod | 2 +- release.go | 19 +++++++------------ 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cf40815..7a014e9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,17 +15,18 @@ env: jobs: build: runs-on: ubuntu-latest - - container: - image: alpine:latest - steps: - - name: Add packages - run: apk add git nodejs - - - name: Checkout repository + - name: Checkout uses: actions/checkout@v4 + - name: Setup Go + uses: actions/setup-go@v5 + with: + go-version-file: go.mod + + - name: Download dependencies + run: go mod download + - name: Run Go release script run: | chmod +x ./.devcontainer/initialize.sh diff --git a/go.mod b/go.mod index 5b95d3b..30b48ff 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module KamishiroUPM -go 1.22.6 +go 1.26.0 require ( github.com/google/uuid v1.6.0 diff --git a/release.go b/release.go index 55c386d..a0e5179 100644 --- a/release.go +++ b/release.go @@ -10,6 +10,7 @@ import ( "os/exec" "path/filepath" "regexp" + "slices" "sort" "strconv" "strings" @@ -159,13 +160,7 @@ func processRepository(workRoot string, repoSetting RepoSetting, npmToken, npmRe } // サーバーに存在するか確認 - existOnServer := false - for _, npmVersion := range npmVersions[packageName] { - if npmVersion == packageVersion { - existOnServer = true - break - } - } + existOnServer := slices.Contains(npmVersions[packageName], packageVersion) if existOnServer { fmt.Printf("[Info] Already Published. %s:%s@%s\n", repositoryName, dir, tag) @@ -318,7 +313,7 @@ func getNpmTags(npmRepo string, packageName string) ([]string, error) { } // JSONをパースしてmapに変換 - var result map[string]interface{} + var result map[string]any if err := json.Unmarshal(body, &result); err != nil { return nil, err } @@ -329,7 +324,7 @@ func getNpmTags(npmRepo string, packageName string) ([]string, error) { // バージョン情報一覧を取得 var versions []string - for version := range result["versions"].(map[string]interface{}) { + for version := range result["versions"].(map[string]any) { versions = append(versions, version) } @@ -337,7 +332,7 @@ func getNpmTags(npmRepo string, packageName string) ([]string, error) { } // 指定されたリポジトリの package.json を取得する関数です。 -func getPackageJson(repoType RepoType, author string, repository string, tag string, dir string) (map[string]interface{}, error) { +func getPackageJson(repoType RepoType, author string, repository string, tag string, dir string) (map[string]any, error) { var url = fmt.Sprintf("%s/%s/%s/%s/%s/package.json", repoTypeMap[repoType], author, repository, tag, dir) // HTTP GET リクエストを送信 @@ -354,7 +349,7 @@ func getPackageJson(repoType RepoType, author string, repository string, tag str } // JSONをパースしてmapに変換 - var result map[string]interface{} + var result map[string]any if err := json.Unmarshal(body, &result); err != nil { return nil, err } @@ -397,7 +392,7 @@ func getNpmAuthToken(npmRegistry, npmUser, npmPass string) (string, error) { return "", err } - var returnData map[string]interface{} + var returnData map[string]any if err := json.Unmarshal(body, &returnData); err != nil { return "", err }