diff --git a/.github/workflows/build-wasm.yml b/.github/workflows/build-wasm.yml index 16738841..8da1ac90 100644 --- a/.github/workflows/build-wasm.yml +++ b/.github/workflows/build-wasm.yml @@ -19,7 +19,7 @@ on: jobs: build_test: name: Build - runs-on: "macos-latest" + runs-on: macos-latest defaults: run: working-directory: ./wasm diff --git a/.github/workflows/release-dotnet.yml b/.github/workflows/release-dotnet.yml index 82fae86a..221254df 100644 --- a/.github/workflows/release-dotnet.yml +++ b/.github/workflows/release-dotnet.yml @@ -28,11 +28,13 @@ jobs: uses: microsoft/setup-msbuild@v1.0.2 - name: Generate Package Version run: | - $json = Invoke-WebRequest 'https://api.github.com/repos/trinsic-id/okapi/releases/latest' | ConvertFrom-Json + $json = Invoke-WebRequest 'https://api.github.com/repos/trinsic-id/okapi/releases/latest' ` + -Headers @{ "Authorization" = "Token $env:API_GITHUB_TOKEN"} | ConvertFrom-Json $version = $json.tag_name.Trim("v") - echo "PACKAGE_VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append shell: pwsh + env: + API_GITHUB_TOKEN: ${{ secrets.API_GITHUB_TOKEN }} - name: Create Nuget package run: | diff --git a/.github/workflows/release-wasm.yml b/.github/workflows/release-wasm.yml index 0097645b..137748a3 100644 --- a/.github/workflows/release-wasm.yml +++ b/.github/workflows/release-wasm.yml @@ -13,7 +13,7 @@ jobs: name: Publish Npm environment: name: npmjs.com - runs-on: windows-latest + runs-on: macos-latest defaults: run: working-directory: ./wasm @@ -23,12 +23,19 @@ jobs: - uses: jetli/wasm-pack-action@v0.3.0 with: version: 'latest' + - run: | + rustup toolchain uninstall stable + rustup toolchain install stable + rustup toolchain install stable --target wasm32-unknown-unknown - name: Generate Package Version run: | - $json = Invoke-WebRequest 'https://api.github.com/repos/trinsic-id/okapi/releases/latest' | ConvertFrom-Json + $json = Invoke-WebRequest 'https://api.github.com/repos/trinsic-id/okapi/releases/latest' ` + -Headers @{ "Authorization" = "Token $env:API_GITHUB_TOKEN"} | ConvertFrom-Json $version = $json.tag_name.Trim("v") echo "PACKAGE_VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf-8 -Append shell: pwsh + env: + API_GITHUB_TOKEN: ${{ secrets.API_GITHUB_TOKEN }} - run: npm set //registry.npmjs.org/:_authToken ${{ secrets.NPM_TOKEN }} - run: | npm run start diff --git a/wasm/Generate-Proto.ps1 b/wasm/Generate-Proto.ps1 index 55811b4b..55637879 100755 --- a/wasm/Generate-Proto.ps1 +++ b/wasm/Generate-Proto.ps1 @@ -1,10 +1,10 @@ # Generate protobuf files for JS and TS param($OutDir = './packages/okapi-proto/src/proto') -$PROTOC_GEN_TS_PATH = "./node_modules/.bin/protoc-gen-ts" -$GRPC_TOOLS_NODE_PROTOC="./node_modules/.bin/grpc_tools_node_protoc" -$OUTPUT_DIR=$OutDir -$PROTO_DIR= Resolve-Path "../proto" +$PROTOC_GEN_TS_PATH = Resolve-Path "./node_modules/.bin/protoc-gen-ts" +$GRPC_TOOLS_NODE_PROTOC = Resolve-Path "./node_modules/.bin/grpc_tools_node_protoc" +$OUTPUT_DIR = $OutDir +$PROTO_DIR = Resolve-Path "../proto" foreach ($Item in Get-ChildItem -Path $PROTO_DIR -Include *.proto -Recurse) { $File = $Item.FullName