Merge pull request #186 from dmalec/cd_fix_windows_and_osx_builds

Fix CD pipeline builds for OSX and Windows
jrincayc · Sep 17, 2024 · 77cba06 · 77cba06
2 parents e494a4e + d2d580a
commit 77cba06
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 42 deletions.
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -8,7 +8,6 @@ on:
     - release*
 
 env:
-  INNO_VERSION: 6.1.2
   WX_WIDGETS_VERSION: 3.2.2.1
   TARGET_OSX_VERSION: 10.14
 
@@ -208,7 +207,8 @@ jobs:
       working-directory: ${{ runner.temp }}/wxWidgets-${{ env.WX_WIDGETS_VERSION }}
       run: |
         cd build-static
-        make install
+        sudo make install
+        sudo cp ../wxwin.m4 /opt/homebrew/share/aclocal/
     - name: Checkout Repository
       uses: actions/checkout@v3
       with:
@@ -235,33 +235,9 @@ jobs:
         name: ucblogo.dmg
         path: ucblogo.dmg
 
-  download_inno_windows:
-    name: Download Inno for Windows
-    runs-on: windows-latest
-    timeout-minutes: 5
-    steps:
-    - name: Cache inno
-      uses: actions/cache@v3
-      id: inno-cache
-      with:
-        path: ${{ runner.temp }}\innosetup-${{ env.INNO_VERSION }}
-        key: ${{ runner.os }}-innosetup-${{ env.INNO_VERSION }}
-    - name: Install Dependencies
-      uses: msys2/setup-msys2@v2
-      with:
-        msystem: MINGW32
-    - name: Download inno
-      if: steps.inno-cache.outputs.cache-hit != 'true'
-      working-directory: ${{ runner.temp }}
-      shell: msys2 {0}
-      run: |
-        mkdir innosetup-${{ env.INNO_VERSION }}
-        cd innosetup-${{ env.INNO_VERSION }}
-        wget -q https://files.jrsoftware.org/is/6/innosetup-${{ env.INNO_VERSION }}.exe
-
   build_windows:
     name: Build Logo for Windows
-    needs: [ download_inno_windows, build_wxwidgets_windows, build_linux ]
+    needs: [ build_wxwidgets_windows, build_linux ]
     runs-on: windows-latest
     timeout-minutes: 15
     steps:
@@ -274,17 +250,6 @@ jobs:
           base-devel
           mingw-w64-i686-toolchain
           unzip
-    - name: Inno Cache
-      uses: actions/cache@v3
-      id: inno-cache
-      with:
-        path: ${{ runner.temp }}\innosetup-${{ env.INNO_VERSION }}
-        key: ${{ runner.os }}-innosetup-${{ env.INNO_VERSION }}
-    - name: Install Inno
-      working-directory: ${{ runner.temp }}\innosetup-${{ env.INNO_VERSION }}
-      shell: pwsh
-      run: |
-        ./innosetup-${{ env.INNO_VERSION }}.exe /SP- /VERYSILENT /ALLUSERS /SUPPRESSMSGBOXES
     - name: wxWidgets Cache
       uses: actions/cache@v3
       id: wxwidgets-cache

diff --git a/coms.c b/coms.c
@@ -445,9 +445,7 @@ NODE *lwait(NODE *args) {
 	n = (unsigned int)getint(num) * 100 / 6; // milliseconds
 	wxLogoSleep(n);
 	//check_throwing;
-	return(UNBOUND); 
-#endif
-
+#else
 	if (getint(num) > 0) {
 #ifdef unix
 #ifdef HAVE_USLEEP
@@ -485,8 +483,9 @@ NODE *lwait(NODE *args) {
 		if (n > 0) sleep(n);
 	    }
 	    input_blocking = 0;
-#endif
+#endif /* unix */
 	}
+#endif /* HAVE_WX */
     }
     return(UNBOUND);
 }