Merge pull request #129 from ggilles/fix-ci-target-branch

Fix CI target branch
Snapchat · Jan 22, 2023 · 768f108 · 768f108
2 parents 99f3d26 + b0c1273
commit 768f108
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -3,7 +3,7 @@ name: Build and Test
 on:
   push:
     branches:
-      - master
+      - main
   pull_request: {}
 
 jobs:
@@ -22,7 +22,7 @@ jobs:
           path: ~/.cache/bazel
           key: ${{ runner.os }}-${{ env.cache-name }}-${{ github.ref }}
           restore-keys: |
-            ${{ runner.os }}-${{ env.cache-name }}-master
+            ${{ runner.os }}-${{ env.cache-name }}-main
 
       - name: Build
         run: bazel build //src:djinni

diff --git a/test-suite/generated-src/wasm/NativeTestHelpers.cpp b/test-suite/generated-src/wasm/NativeTestHelpers.cpp
@@ -282,7 +282,7 @@ em::val NativeTestHelpers::add_one_if_present(const em::val& w_f) {
         return ::djinni::FutureAdaptor<::djinni::Optional<std::experimental::optional, ::djinni::I32>>::fromCpp(std::move(r));
     }
     catch(const std::exception& e) {
-        return djinni::ExceptionHandlingTraits<::djinni::FutureAdaptor<::djinni::Optional<std::experimental::optional, ::djinni::I32>>>::handleNativeException(e);
+        return ::djinni::ExceptionHandlingTraits<::djinni::FutureAdaptor<::djinni::Optional<std::experimental::optional, ::djinni::I32>>>::handleNativeException(e);
     }
 }
 em::val NativeTestHelpers::check_async_interface(const em::val& w_i) {