diff --git a/.github/workflows/pushaction.yml b/.github/workflows/pushaction.yml index 46b1b5c..c6a2bb2 100644 --- a/.github/workflows/pushaction.yml +++ b/.github/workflows/pushaction.yml @@ -6,54 +6,54 @@ env: GRADLE_USER_HOME: .gradle jobs: - macos: - runs-on: macos-11 - steps: - - uses: actions/checkout@v3 - with: - submodules: 'recursive' - - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: Set up JDK 8 - uses: actions/setup-java@v3 - with: - distribution: 'zulu' - java-version: 8 + # macos: + # runs-on: macos-11 + # steps: + # - uses: actions/checkout@v3 + # with: + # submodules: 'recursive' + # - uses: actions/cache@v3 + # with: + # path: | + # ~/.gradle/caches + # ~/.gradle/wrapper + # key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} + # restore-keys: | + # ${{ runner.os }}-gradle- + # - name: Set up JDK 8 + # uses: actions/setup-java@v3 + # with: + # distribution: 'zulu' + # java-version: 8 - - run: mkdir -p SDL/build-macosarm64 - # No --disable-video for macOS https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c70c727c98b24ad8b44e05285b8785be15062af0 - - run: ../configure --host=aarch64-apple-darwin CFLAGS="-arch arm64 -fPIC -mmacosx-version-min=10.7" CPPFLAGS="-arch arm64 -fPIC -mmacosx-version-min=10.7" LDFLAGS="-arch arm64 -mmacosx-version-min=10.7" --disable-audio --disable-video-vulkan --disable-render --disable-filesystem --disable-threads --disable-directx --disable-mmx --disable-3dnow --disable-sse --disable-sse2 --disable-sse3 --disable-cpuinfo --disable-sensor --enable-hidapi --disable-joystick-mfi - working-directory: SDL/build-macosarm64 - - run: make -j - working-directory: SDL/build-macosarm64 + # - run: mkdir -p SDL/build-macosarm64 + # # No --disable-video for macOS https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c70c727c98b24ad8b44e05285b8785be15062af0 + # - run: ../configure --host=aarch64-apple-darwin CFLAGS="-arch arm64 -fPIC -mmacosx-version-min=10.7" CPPFLAGS="-arch arm64 -fPIC -mmacosx-version-min=10.7" LDFLAGS="-arch arm64 -mmacosx-version-min=10.7" --disable-audio --disable-video-vulkan --disable-render --disable-filesystem --disable-threads --disable-directx --disable-mmx --disable-3dnow --disable-sse --disable-sse2 --disable-sse3 --disable-cpuinfo --disable-sensor --enable-hidapi --disable-joystick-mfi + # working-directory: SDL/build-macosarm64 + # - run: make -j + # working-directory: SDL/build-macosarm64 - - run: mkdir -p SDL/build-macos64 - # No --disable-video for macOS https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c70c727c98b24ad8b44e05285b8785be15062af0 - - run: ../configure CFLAGS="-arch x86_64 -fPIC -mmacosx-version-min=10.7" CPPFLAGS="-arch x86_64 -fPIC -mmacosx-version-min=10.7" LDFLAGS="-arch x86_64 -mmacosx-version-min=10.7" --disable-audio --disable-video-vulkan --disable-render --disable-filesystem --disable-threads --disable-directx --disable-mmx --disable-3dnow --disable-sse --disable-sse2 --disable-sse3 --disable-cpuinfo --disable-sensor --enable-hidapi --disable-joystick-mfi - working-directory: SDL/build-macos64 - - run: make -j - working-directory: SDL/build-macos64 - - run: sudo make install - working-directory: SDL/build-macos64 + # - run: mkdir -p SDL/build-macos64 + # # No --disable-video for macOS https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c70c727c98b24ad8b44e05285b8785be15062af0 + # - run: ../configure CFLAGS="-arch x86_64 -fPIC -mmacosx-version-min=10.7" CPPFLAGS="-arch x86_64 -fPIC -mmacosx-version-min=10.7" LDFLAGS="-arch x86_64 -mmacosx-version-min=10.7" --disable-audio --disable-video-vulkan --disable-render --disable-filesystem --disable-threads --disable-directx --disable-mmx --disable-3dnow --disable-sse --disable-sse2 --disable-sse3 --disable-cpuinfo --disable-sensor --enable-hidapi --disable-joystick-mfi + # working-directory: SDL/build-macos64 + # - run: make -j + # working-directory: SDL/build-macos64 + # - run: sudo make install + # working-directory: SDL/build-macos64 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew jnigen jnigenBuild - - name: Upload macOS natives - uses: actions/upload-artifact@v3 - with: - name: macos-natives - path: libs + # - name: Grant execute permission for gradlew + # run: chmod +x gradlew + # - name: Build with Gradle + # run: ./gradlew jnigen jnigenBuild + # - name: Upload macOS natives + # uses: actions/upload-artifact@v3 + # with: + # name: macos-natives + # path: libs linux: - needs: macos + # needs: macos runs-on: ubuntu-20.04 container: ubuntu:18.04 env: @@ -118,11 +118,11 @@ jobs: run: sudo apt-get -yq install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf binutils-arm-linux-gnueabihf - name: Install Linux arm64 compilers/libraries run: sudo apt-get -yq install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu - - name: Download macOS natives - uses: actions/download-artifact@v3 - with: - name: macos-natives - path: libs + # - name: Download macOS natives + # uses: actions/download-artifact@v3 + # with: + # name: macos-natives + # path: libs - run: find -type f -name "*.h" -exec sed -i 's/extern DECLSPEC//' {} \; working-directory: SDL @@ -140,29 +140,29 @@ jobs: - run: make -j working-directory: SDL/build-linux32 - - run: mkdir -p SDL/build-linuxarm32 - - run: ../configure --host=arm-linux-gnueabihf CFLAGS="-fPIC" CPPFLAGS="-fPIC" --disable-audio --disable-video --disable-video-vulkan --disable-render --disable-filesystem --disable-threads --disable-directx --disable-mmx --disable-3dnow --disable-sse --disable-sse2 --disable-sse3 --disable-cpuinfo --disable-sensor --enable-hidapi - working-directory: SDL/build-linuxarm32 - - run: make -j - working-directory: SDL/build-linuxarm32 + # - run: mkdir -p SDL/build-linuxarm32 + # - run: ../configure --host=arm-linux-gnueabihf CFLAGS="-fPIC" CPPFLAGS="-fPIC" --disable-audio --disable-video --disable-video-vulkan --disable-render --disable-filesystem --disable-threads --disable-directx --disable-mmx --disable-3dnow --disable-sse --disable-sse2 --disable-sse3 --disable-cpuinfo --disable-sensor --enable-hidapi + # working-directory: SDL/build-linuxarm32 + # - run: make -j + # working-directory: SDL/build-linuxarm32 - - run: mkdir -p SDL/build-linuxarm64 - - run: ../configure --host=aarch64-linux-gnu CFLAGS="-fPIC" CPPFLAGS="-fPIC" --disable-audio --disable-video --disable-video-vulkan --disable-render --disable-filesystem --disable-threads --disable-directx --disable-mmx --disable-3dnow --disable-sse --disable-sse2 --disable-sse3 --disable-cpuinfo --disable-sensor --enable-hidapi - working-directory: SDL/build-linuxarm64 - - run: make -j - working-directory: SDL/build-linuxarm64 + # - run: mkdir -p SDL/build-linuxarm64 + # - run: ../configure --host=aarch64-linux-gnu CFLAGS="-fPIC" CPPFLAGS="-fPIC" --disable-audio --disable-video --disable-video-vulkan --disable-render --disable-filesystem --disable-threads --disable-directx --disable-mmx --disable-3dnow --disable-sse --disable-sse2 --disable-sse3 --disable-cpuinfo --disable-sensor --enable-hidapi + # working-directory: SDL/build-linuxarm64 + # - run: make -j + # working-directory: SDL/build-linuxarm64 - - run: mkdir -p SDL/build-windows32 - - run: ../configure --host=i686-w64-mingw32 --disable-audio --disable-render --disable-power --disable-filesystem --disable-hidapi - working-directory: SDL/build-windows32 - - run: make -j - working-directory: SDL/build-windows32 + # - run: mkdir -p SDL/build-windows32 + # - run: ../configure --host=i686-w64-mingw32 --disable-audio --disable-render --disable-power --disable-filesystem --disable-hidapi + # working-directory: SDL/build-windows32 + # - run: make -j + # working-directory: SDL/build-windows32 - - run: mkdir -p SDL/build-windows64 - - run: ../configure --host=x86_64-w64-mingw32 --disable-audio --disable-render --disable-power --disable-filesystem --disable-hidapi - working-directory: SDL/build-windows64 - - run: make -j - working-directory: SDL/build-windows64 + # - run: mkdir -p SDL/build-windows64 + # - run: ../configure --host=x86_64-w64-mingw32 --disable-audio --disable-render --disable-power --disable-filesystem --disable-hidapi + # working-directory: SDL/build-windows64 + # - run: make -j + # working-directory: SDL/build-windows64 - name: Grant execute permission for gradlew run: chmod +x gradlew