conf: updates to xmake config per #242

galkahana · Dec 27, 2023 · 77caa31 · 77caa31
1 parent e806bc6
commit 77caa31
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/ci-xmake-linux.yml b/.github/workflows/ci-xmake-linux.yml
@@ -1,10 +1,10 @@
-name: Build on linux
+name: xmake
 
 on:
   push:
-    branches: [ main ]
+    branches: [ master ]
   pull_request:
-    branches: [ main ]
+    branches: [ master ]
   workflow_dispatch:
 
 jobs:
@@ -21,7 +21,7 @@ jobs:
           echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/.xmake-global" >> "${{ github.env }}"
       - uses: xmake-io/github-action-setup-xmake@v1
         with:
-          xmake-version: v2.8.3
+          xmake-version: v2.8.6
       - name: update repo
         run: xmake repo -u
       - uses: actions/checkout@v3

diff --git a/.gitignore b/.gitignore
@@ -41,6 +41,9 @@ xcode/Build
 xcode/DerivedData
 .DS_Store
 
+#vscode unwanted#
+.vscode/compile_commands.json
+
 #unwanted other sources #
 ########################
 zlib-1.2.3