From 90aa6ed3690239c80b6a77e050eb7dc451ebcd13 Mon Sep 17 00:00:00 2001 From: Don Cross Date: Mon, 2 May 2022 12:30:23 -0400 Subject: [PATCH] Cleaned up GitHub Actions configuration. Deleted the do-nothing placeholders for installing the Kotlin Native compiler. We are not going to support Kotlin Native for now. Removed redundant installation of pylint from the Windows commit_hook.bat. Other batch file cleanup, now that I know "||" works in Windows. --- .github/workflows/astronomy-engine-tests.yml | 8 +------- generate/commit_hook.bat | 18 ++++-------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/.github/workflows/astronomy-engine-tests.yml b/.github/workflows/astronomy-engine-tests.yml index df3394d1..d634f3ca 100644 --- a/.github/workflows/astronomy-engine-tests.yml +++ b/.github/workflows/astronomy-engine-tests.yml @@ -35,18 +35,12 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 - - name: Install Kotlin Native compiler Linux - if: startsWith(matrix.os, 'ubuntu') - run: generate/install_kotlin_native 'https://github.com/JetBrains/kotlin/releases/download/v1.6.20/kotlin-native-linux-x86_64-1.6.20.tar.gz' - uses: gradle/wrapper-validation-action@v1 + - name: Test Astronomy Engine Linux if: startsWith(matrix.os, 'ubuntu') run: cd generate && rm -f output/vsop*.txt output/*.eph output/jupiter_moons.txt && ./run && ./verify_clean - - name: Install Kotlin Native compiler macOs - if: startsWith(matrix.os, 'macOS') - run: generate/install_kotlin_native 'https://github.com/JetBrains/kotlin/releases/download/v1.6.20/kotlin-native-macos-x86_64-1.6.20.tar.gz' - - uses: gradle/wrapper-validation-action@v1 - name: Test Astronomy Engine macOs if: startsWith(matrix.os, 'macOS') run: cd generate && rm -f output/vsop*.txt output/*.eph output/jupiter_moons.txt && ./run && ./verify_clean diff --git a/generate/commit_hook.bat b/generate/commit_hook.bat index 42675d6b..0693795d 100644 --- a/generate/commit_hook.bat +++ b/generate/commit_hook.bat @@ -8,28 +8,18 @@ REM Change to project/repo root directory. cd %~dp0\.. echo.commit_hook: Repo root = %cd% -echo.commit_hook: Installing Python linter. -python -m pip install --upgrade pip -if errorlevel 1 (exit /b 1) -pip install pylint -if errorlevel 1 (exit /b 1) - echo.commit_hook: Installing Doxygen. md bin cd bin -curl -o doxygen.zip https://www.doxygen.nl/files/doxygen-1.9.3.windows.x64.bin.zip -if errorlevel 1 (exit /b 1) -7z x doxygen.zip -if errorlevel 1 (exit /b 1) +curl -o doxygen.zip https://www.doxygen.nl/files/doxygen-1.9.3.windows.x64.bin.zip || exit /b 1 +7z x doxygen.zip || exit /b 1 del doxygen.zip REM change to 'generate' directory, which is where this batch file is located. cd %~dp0 echo.commit_hook: Running Astronomy Engine tests. del output\vsop*.txt output\*.eph output\jupiter_moons.txt -call run.bat -if errorlevel 1 (exit /b 1) -call verify_clean.bat -if errorlevel 1 (exit /b 1) +call run.bat || exit /b 1 +call verify_clean.bat || exit /b 1 echo.commit_hook: SUCCESS exit /b 0