Set AStyle to v3.5.2

alxhoff · alxhoff · commit 81a23b4a268a · 2024-09-09T14:46:19.000+02:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -95,7 +95,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install SDL2 Dependencies
-        run: sudo apt-get install -y libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev libsdl2-gfx-dev libsdl2-dev astyle
+        run: |
+          sudo apt-get install -y libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev libsdl2-gfx-dev libsdl2-dev curl
+          curl -L https://sourceforge.net/projects/astyle/files/astyle/astyle%203.5/astyle-3.5.2.tar.bz2/download -o astyle.tar.bz2  
+          tar -xvjf astyle.tar.bz2
+          cd astyle/build/gcc
+          make
+          sudo make install
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Configure CMake
diff --git a/cmake/tests.cmake b/cmake/tests.cmake
@@ -83,8 +83,13 @@ if(ENABLE_ASTYLE)
         ${CHECK_FILES}
     )
 
+    list(APPEND ASTYLE_VERSION
+        --version
+    )
+
     add_custom_target(
         format
+        COMMAND ${ASTYLE_BIN} ${ASTYLE_VERSION}
         COMMAND ${ASTYLE_BIN} ${ASTYLE_ARGS}
         COMMENT "running astyle"
     )

Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,13 @@ if(ENABLE_ASTYLE)`
`83`	`83`	`${CHECK_FILES}`
`84`	`84`	`)`
`85`	`85`
	`86`	`+ list(APPEND ASTYLE_VERSION`
	`87`	`+ --version`
	`88`	`+ )`
	`89`	`+`
`86`	`90`	`add_custom_target(`
`87`	`91`	`format`
	`92`	`+ COMMAND ${ASTYLE_BIN} ${ASTYLE_VERSION}`
`88`	`93`	`COMMAND ${ASTYLE_BIN} ${ASTYLE_ARGS}`
`89`	`94`	`COMMENT "running astyle"`
`90`	`95`	`)`