fix: GitPod container image now needs their workspace image as base (#…

…4065)
EdgeTX · Sep 27, 2023 · 41f779f · 41f779f
1 parent 5c202da
commit 41f779f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -68,7 +68,7 @@ jobs:
           - xlite
           - xlites
     container:
-      image: ghcr.io/edgetx/edgetx-dev:2.9.0
+      image: ghcr.io/edgetx/edgetx-dev:2.9.1
       volumes:
         - ${{ github.workspace }}:/src
     steps:
@@ -109,7 +109,7 @@ jobs:
           - x9lite;x9lites
           - xlite;xlites
     container:
-      image: ghcr.io/edgetx/edgetx-dev:2.9.0
+      image: ghcr.io/edgetx/edgetx-dev:2.9.1
       volumes:
         - ${{ github.workspace }}:/src
     steps:

diff --git a/.gitpod.yml b/.gitpod.yml
@@ -1,8 +1,4 @@
-image: ghcr.io/edgetx/edgetx-dev:2.9.0
-
-vscode:
-  extensions:
-    - ms-vscode.cpptools
+image: ghcr.io/edgetx/gitpod-workspace:2.9.1
 
 tasks:
   - name: Prep build folder

diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
@@ -184,7 +184,7 @@ if(RTC_BACKUP_RAM)
     )
 
   # Add custom target for debugging
-  add_custom_target(datacopy DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/datacopy.cpp)
+  add_custom_target(datacopy DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/datacopy.inc)
 endif()
 
 option(LUA_MIXER "Enable LUA mixer/model scripts support" OFF)