Try fix ci

rquickjs · Nov 19, 2024 · 130d5f0 · 130d5f0
1 parent 3dd8708
commit 130d5f0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,6 +11,9 @@ on:
       arch:
         required: true
         type: string
+      toolchain:
+        required: true
+        type: string
 
 jobs:
   build:
@@ -23,7 +26,7 @@ jobs:
       - name: Setup Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable # Modules should work on stable, not just nightly
+          toolchain: ${{ inputs.toolchain }}
       - name: Run tests
         run: |
           cargo test
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,12 +36,15 @@ jobs:
           - os: ubuntu-latest
             platform: linux
             arch: x86_64
+            toolchain: stable
           - os: macos-latest
             platform: darwin
             arch: x86_64
+            toolchain: stable
           - os: windows-latest
             platform: windows
             arch: x86_64
+            toolchain: stable-x86_64-pc-windows-gnu
     uses: ./.github/workflows/build.yml
     with:
       os: ${{ matrix.os }}

diff --git a/libs/utils/src/module.rs b/libs/utils/src/module.rs
@@ -1,4 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright Emile Fugulin for modifications.
 // SPDX-License-Identifier: Apache-2.0
 // Source: https://github.com/awslabs/llrt/blob/07eb540a204dcdce44143220876630804f381ca6/llrt_utils/src/module.rs
 use rquickjs::{module::Exports, Ctx, Object, Result, Value};

diff --git a/libs/utils/src/result.rs b/libs/utils/src/result.rs
@@ -1,4 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright Emile Fugulin for modifications.
 // SPDX-License-Identifier: Apache-2.0
 // Source: https://github.com/awslabs/llrt/blob/07eb540a204dcdce44143220876630804f381ca6/llrt_utils/src/result.rs
 use std::{fmt::Write, result::Result as StdResult};

diff --git a/modules/os/src/lib.rs b/modules/os/src/lib.rs
@@ -1,4 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright Emile Fugulin for modifications.
 // SPDX-License-Identifier: Apache-2.0
 use std::env;