Use image from xLightsSequencer/xlights-build-docker for building

OnlineDynamic · Nov 28, 2023 · e8ba822 · e8ba822
1 parent 11a97ea
commit e8ba822
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/Ubuntu_Window_Release.yml b/.github/workflows/Ubuntu_Window_Release.yml
@@ -14,8 +14,8 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'true'
-      - run: docker pull debenham/xlights
-      - run: docker run --name buildvm debenham/xlights /bin/bash Recipe.appimage
+      - run: docker pull ghcr.io/xlightssequencer/xlights-build-docker:master
+      - run: docker run --name buildvm ghcr.io/xlightssequencer/xlights-build-docker /bin/bash Recipe.appimage
       - run: 'docker cp buildvm:/xLights/xLights/AppImage/ /tmp/'
       - run: ls -lh /tmp/AppImage
 

diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,8 @@ services:
 git:
   depth: 3
 script:
-  - docker pull debenham/xlights
-  - docker run --name buildvm debenham/xlights /bin/bash Recipe.appimage
+  - docker pull docker pull ghcr.io/xlightssequencer/xlights-build-docker:master
+  - docker run --name buildvm ghcr.io/xlightssequencer/xlights-build-docker /bin/bash Recipe.appimage
 after_success:
   - docker cp buildvm:/xLights/xLights/AppImage/ /tmp/
   - ls -lh /tmp/*

diff --git a/macOS b/macOS
+2 −0		Assets/xLights/xLightsArchive.entitlements
+2 −2		Assets/xLights/xLightsDebug.entitlements
+1 −1		Assets/xLights/xlights.mac.properties
+35 −84		README.macOS
+6 −6		macOS-src/osxUtils/xlMacUtils.mm
+13 −3		scripts/BuildDMG.sh
+25 −119		xLights.xcodeproj/project.pbxproj
+1 −1		xLights.xcodeproj/xcshareddata/xcschemes/xLights.xcscheme