lint

fortran-gaming · May 8, 2024 · 25c4fe7 · 25c4fe7
1 parent 87faa66
commit 25c4fe7
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 29 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.github/workflows/ci_cmake.yml b/.github/workflows/ci_cmake.yml
@@ -13,6 +13,6 @@ jobs:
   linux:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - run: cmake --workflow --preset default
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,20 +1,17 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.19)
 
 project(LunarLander1969
   LANGUAGES Fortran)
 
 enable_testing()
 
-# --- auto-ignore build directory
-if(NOT EXISTS ${PROJECT_BINARY_DIR}/.gitignore)
-  file(WRITE ${PROJECT_BINARY_DIR}/.gitignore "*")
-endif()
-
 add_executable(lunar-lander lunar.f90)
 
 add_test(NAME basic
 COMMAND ${CMAKE_COMMAND}
   -Dexe:FILEPATH=$<TARGET_FILE:lunar-lander>
-  -P ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_stdin.cmake
+  -P ${CMAKE_CURRENT_SOURCE_DIR}/test/test_stdin.cmake
 )
 set_property(TEST basic PROPERTY PASS_REGULAR_EXPRESSION "GOOD LANDING")
+
+file(GENERATE OUTPUT .gitignore CONTENT "*")
diff --git a/tests/fail.asc → test/fail.asc b/tests/fail.asc → test/fail.asc
diff --git a/tests/good.asc → test/good.asc b/tests/good.asc → test/good.asc
diff --git a/tests/ok.asc → test/ok.asc b/tests/ok.asc → test/ok.asc
diff --git a/tests/test_stdin.cmake → test/test_stdin.cmake b/tests/test_stdin.cmake → test/test_stdin.cmake
diff --git a/tests/test_stdin.py → test/test_stdin.py b/tests/test_stdin.py → test/test_stdin.py
@@ -25,4 +25,4 @@
 
 args = P.args.strip("\"'").split() if P.args else []
 
-subprocess.check_call([str(exe)] + args, stdin=filein.open(), universal_newlines=True)
+subprocess.check_call([str(exe)] + args, stdin=filein.open(), text=True)