Merge pull request #3 from ageha734/prerelease

ageha734 · web-flow · commit 571f395272c7 · 2025-10-24T00:06:14.000+09:00
chore
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -5,4 +5,5 @@ DOTNET_ROOT = { value = "", force = true }
 [alias]
 build = "build --target wasm32-wasip1"
 format = "fmt --all --check"
-lint = "clippy --all-targets --all-features -- -D warnings"
+lint = "clippy --workspace --all-targets"
+test = "nextest run --no-default-features"
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,16 @@
+./.cargo/* @ageha734
+./.cursor/* @ageha734
+./.github/* @ageha734
+./.vscode/* @ageha734
+./scripts/* @ageha734
+./.clinerules @ageha734
+./.commitlint.yaml @ageha734
+./.dprint.json @ageha734
+./.editorconfig @ageha734
+./.gitignore @ageha734
+./CHANGELOG.md @github_actions
+./clippy.toml @ageha734
+./lefthook.yml @ageha734
+./README.md @ageha734
+./rust-toolchain.toml @ageha734
+./rustfmt.toml @ageha734
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,25 @@
+<!-- markdownlint-disable first-line-h1 -->
+
+## Why / なぜ
+
+<!-- なぜこの変更が必要なのか、背景や課題を記述してください -->
+<!-- Please describe why this change is necessary, including background and issues -->
+
+## Goal / 目標
+
+<!-- この変更によって達成したい目標を記述してください -->
+<!-- Please describe the goals you want to achieve with this change -->
+
+## Steps to Reproduce / 動作手順書
+
+<!-- この変更を適用した後の動作手順を記述してください -->
+<!-- Please describe the steps to reproduce after applying this change -->
+
+1.
+2.
+3.
+
+## Verification / 動作検証
+
+<!-- 動作検証の結果を記述してください -->
+<!-- Please describe the results of your verification/testing -->
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -104,28 +104,66 @@ jobs:
               targets: wasm32-wasip1
               channel: '1.90.0'
               cache: true
+          env:
+              GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+        - name: Build WASM Plugin
+          run: cargo build --target wasm32-wasip1
+
+        - name: Verify Build Output
+          shell: bash
+          run: |
+              echo "Checking for WASM files..."
+              ls -la target/wasm32-wasip1/debug/ || echo "Debug directory not found"
+              find target -name "*.wasm" -type f || echo "No WASM files found"
 
-        - id: build
-          name: Build Proto Plugin
-          uses: moonrepo/build-wasm-plugin@60ff6f68ae0e0b4dc4b959835cd84b8d535403c2 # v0.4.2
+        - name: Upload Plugin Artifact
+          uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+          with:
+              name: plugin-${{ matrix.os }}
+              path: target/wasm32-wasip1/debug/gcloud_plugin.wasm
+              retention-days: 1
+              if-no-files-found: error
 
     run-e2e:
-        needs: [run-format, run-lint, run-test]
+        needs: [run-build, run-test]
 
-        runs-on: ubuntu-24.04
+        runs-on: ${{ matrix.os }}
+
+        strategy:
+            matrix:
+                os: [ubuntu-24.04, windows-2025, macos-15]
+            fail-fast: false
 
         steps:
         - name: Checkout Repository
           uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
+        - name: Download Plugin Artifact
+          uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+          with:
+              name: plugin-${{ matrix.os }}
+              path: target/wasm32-wasip1/debug/
+
+        - name: Verify Downloaded Artifact
+          shell: bash
+          run: |
+              echo "Checking downloaded files..."
+              ls -la target/wasm32-wasip1/debug/ || echo "Debug directory not found"
+              test -f target/wasm32-wasip1/debug/gcloud_plugin.wasm || (echo "gcloud_plugin.wasm not found" && exit 1)
+              echo "Plugin file found successfully"
+
         - name: Setup Proto
-          uses: moonrepo/setup-proto@60ff6f68ae0e0b4dc4b959835cd84b8d535403c2 # v0.4.2
+          uses: moonrepo/setup-toolchain@3927d571963592235146e8e0b5261206954796a2 # v0.6.0
+          with:
+              auto-install: true
+              proto-version: '0.53.2'
 
         - name: Run E2E Tests
           run: proto install gcloud-test
 
         - name: Run Versions Test
-          run: gcloud-test versions
+          run: gcloud version
 
     run-approval:
         needs: [run-build, run-e2e]
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,6 +12,9 @@ jobs:
     build:
         runs-on: ubuntu-24.04
 
+        outputs:
+            changelog_entry: ${{ steps.build.outputs.changelog_entry }}
+
         steps:
         - name: Checkout Repository
           uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -24,22 +27,33 @@ jobs:
               cache-targets: release
               cache: false
 
-        - if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
-          id: build
+        - id: build
           name: Build Proto Plugin
           uses: moonrepo/build-wasm-plugin@60ff6f68ae0e0b4dc4b959835cd84b8d535403c2 # v0.4.2
 
+        - name: Upload Build Artifacts
+          uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+          with:
+              name: proto-plugin-artifacts
+              path: builds/*
+              retention-days: 1
+
     release:
         needs: build
 
-        if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
         runs-on: ubuntu-24.04
 
         steps:
+        - name: Download Build Artifacts
+          uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+          with:
+              name: proto-plugin-artifacts
+              path: builds
+
         - name: Release
           uses: ncipollo/release-action@bcfe5470707e8832e12347755757cec0eb3c22af # v1.18.0
           with:
-              artifacts: ${{ steps.build.outputs.artifacts }}
+              artifacts: builds/*
               artifactErrorsFailBuild: true
               body: ${{ steps.build.outputs.changelog_entry }}
               makeLatest: true
@@ -62,10 +76,14 @@ jobs:
     update-changelog:
         needs: release
 
-        if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
         runs-on: ubuntu-24.04
 
         steps:
+        - name: Checkout Repository
+          uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+          with:
+              ref: ${{ github.event.repository.default_branch }}
+
         - name: Update CHANGELOG
           run: |
               VERSION=${GITHUB_REF_NAME#v}
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 # Generated by Cargo
 # will have compiled files and executables
-debug/
 target/
 
 # These are backup files generated by rustfmt
diff --git a/.prototools b/.prototools
@@ -1,5 +1,4 @@
 proto = "0.53.2"
-moon = "1.41.3"
 
 commitlint = "0.10.1"
 dprint = "0.50.1"
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,10 +14,10 @@ pre-release-replacements = [
 crate-type = ["cdylib", "lib"]
 
 [dependencies]
-extism-pdk = "1.4.1"
-proto_pdk = "0.30.1"
-proto_pdk_api = "0.29.1"
-schematic = { version = "0.18.11", default-features = false, features = ["schema"] }
+extism-pdk = { version = "1.4.1", optional = true }
+proto_pdk = { version = "0.30.1", optional = true }
+proto_pdk_api = { version = "0.29.1", optional = true }
+schematic = { version = "0.18.11", default-features = false, features = ["schema"], optional = true }
 serde = { version = "1.0.219", features = ["derive"] }
 
 [dev-dependencies]
@@ -27,7 +27,7 @@ tokio = { version = "1.46.1", features = ["full"] }
 
 [features]
 default = ["wasm"]
-wasm = []
+wasm = ["dep:extism-pdk", "dep:proto_pdk", "dep:proto_pdk_api", "dep:schematic"]
 
 [profile.release]
 codegen-units = 1
diff --git a/lefthook.yml b/lefthook.yml
@@ -4,10 +4,13 @@ commit-msg:
     - run: commitlint lint --message "$1"
 pre-commit:
     parallel: true
-    jobs:
-    - run: cargo fmt --all --check
-      glob: '**/*.rs'
-    - run: cargo clippy --all-targets --all-features -- -D warnings
-      glob: '**/*.rs'
-    - run: cargo test
-      glob: '**/*.rs'
+    commands:
+        format:
+            glob: '**/*.rs'
+            run: cargo fmt --all --check
+        lint:
+            glob: '**/*.rs'
+            run: cargo clippy --workspace --all-targets
+        build-and-test:
+            glob: '**/*.rs'
+            run: cargo build --target wasm32-wasip1 && cargo nextest run --no-default-features
diff --git a/scripts/tag.sh b/scripts/tag.sh
@@ -89,21 +89,23 @@ check_git_status() {
     if ! git diff-index --quiet HEAD --; then
         error "Uncommitted changes found. Please commit them first."
     fi
+}
 
-    local branch=$(git rev-parse --abbrev-ref HEAD)
-    if [[ "$branch" != "master" && "$branch" != "main" ]]; then
-        warning "Current branch is '$branch'. You are trying to create a tag on a branch other than master/main."
-        read -p "Continue? (y/N): " -n 1 -r
-        echo
-        if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-            error "Processing interrupted"
-        fi
+get_main_branch() {
+    if git rev-parse --verify main >/dev/null 2>&1; then
+        echo "main"
+    elif git rev-parse --verify master >/dev/null 2>&1; then
+        echo "master"
+    else
+        error "Neither 'main' nor 'master' branch found"
     fi
 }
 
 create_tag() {
     local version=$1
     local tag_name="v$version"
+    local current_branch=$(git rev-parse --abbrev-ref HEAD)
+    local main_branch=$(get_main_branch)
 
     if git rev-parse "$tag_name" >/dev/null 2>&1; then
         error "Tag '$tag_name' already exists"
@@ -114,15 +116,39 @@ create_tag() {
     git commit -m "chore: bump version to $version"
     success "Changes committed"
 
+    # If current branch is not main/master, execute PR workflow
+    if [[ "$current_branch" != "$main_branch" ]]; then
+        info "Pushing branch '$current_branch'..."
+        git push origin "$current_branch"
+        success "Branch pushed"
+
+        info "Merging PR with gh command..."
+        if gh pr merge --auto --squash --delete-branch 2>/dev/null; then
+            success "PR merged and branch deleted"
+        else
+            warning "Failed to auto-merge. Attempting manual merge..."
+            if gh pr merge --squash --delete-branch; then
+                success "PR merged and branch deleted"
+            else
+                error "Failed to merge PR. Please merge manually and run this script again."
+            fi
+        fi
+
+        info "Switching to $main_branch branch..."
+        git checkout "$main_branch"
+        success "Switched to $main_branch"
+
+        info "Pulling latest changes..."
+        git pull origin "$main_branch"
+        success "Pulled latest changes"
+    fi
+
     git tag -a "$tag_name" -m "Release $version"
     success "Tag '$tag_name' created"
 
-    info ""
-    info "You can push the tag with the following command:"
-    info "  git push origin $tag_name"
-    info ""
-    info "Or push all tags:"
-    info "  git push origin --tags"
+    info "Pushing tag to origin..."
+    git push origin "$tag_name"
+    success "Tag '$tag_name' pushed"
 }
 
 main() {
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,7 +1,11 @@
+#[cfg(feature = "wasm")]
 pub mod config;
+pub mod version;
 
 #[cfg(feature = "wasm")]
 mod proto;
 
 #[cfg(feature = "wasm")]
 pub use proto::*;
+
+pub use version::extract_version_from_name;
diff --git a/src/proto.rs b/src/proto.rs
diff --git a/src/version.rs b/src/version.rs
diff --git a/tests/download_test.rs b/tests/download_test.rs
diff --git a/tests/snapshots/shims_test__gcloud_tool__creates_shims.snap b/tests/snapshots/shims_test__gcloud_tool__creates_shims.snap
diff --git a/tests/versions_test.rs b/tests/versions_test.rs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`proto = "0.53.2"`
`2`		`-moon = "1.41.3"`
`3`	`2`
`4`	`3`	`commitlint = "0.10.1"`
`5`	`4`	`dprint = "0.50.1"`