From 41f779f7e9a3aee6ab22ed9ecc0aa7a2ea375d99 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphaelcoeffic@users.noreply.github.com>
Date: Wed, 27 Sep 2023 08:09:25 +0200
Subject: [PATCH] fix: GitPod container image now needs their workspace image
 as base (#4065)

---
 .github/workflows/actions.yml | 4 ++--
 .gitpod.yml                   | 6 +-----
 radio/src/CMakeLists.txt      | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 681a53a869b..19fc04b2714 100644
--- 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
index 42b487997f4..855e4ff1d8a 100644
--- 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
index 68c9984fb9c..a438e3ccb45 100644
--- 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)