Merge branch 'master' into version_bump

SpiNNakerManchester · May 2, 2024 · f1bcdd7 · f1bcdd7
2 parents 1223a57 + f0a871f
commit f1bcdd7
Show file tree

Hide file tree

Showing 28 changed files with 592 additions and 238 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,7 +41,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v3.13.0
+      uses: actions/setup-java@v4.0.0
       with:
         distribution: 'zulu'
         java-version: ${{ matrix.java }}
@@ -69,7 +69,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK
-      uses: actions/setup-java@v3.13.0
+      uses: actions/setup-java@v4.0.0
       with:
         distribution: 'zulu'
         java-version: ${{ matrix.java }}
@@ -93,7 +93,7 @@ jobs:
       continue-on-error: true
     - name: Upload Build (JDK 11 only)
       if: matrix.java == 11
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: spinnaker-exe.jar
         path: SpiNNaker-front-end/target/spinnaker-exe.jar
@@ -114,7 +114,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v3.13.0
+      uses: actions/setup-java@v4.0.0
       with:
         distribution: 'zulu'
         java-version: ${{ matrix.java }}
@@ -135,7 +135,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v3.13.0
+      uses: actions/setup-java@v4.0.0
       with:
         distribution: 'zulu'
         java-version: 11

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -45,6 +45,10 @@ env:
 
 jobs:
   analyze:
+    permissions:
+      actions: read
+      contents: write
+      security-events: write
     name: Analyze
     runs-on: ubuntu-latest
     timeout-minutes: 15
@@ -70,7 +74,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -79,7 +83,7 @@ jobs:
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
     # Set up right Java version: https://github.com/github/codeql-action/issues/825
-    - uses: actions/setup-java@v3.13.0
+    - uses: actions/setup-java@v4.0.0
       with:
         java-version: ${{ matrix.version }}
         distribution: zulu
@@ -93,7 +97,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -107,4 +111,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -29,6 +29,8 @@ env:
 
 jobs:
   build:
+    permissions:
+      contents: write
     runs-on: ubuntu-latest
     timeout-minutes: 10
     strategy:
@@ -46,7 +48,7 @@ jobs:
           key: ${{ runner.os }}-node-${{ hashFiles('SpiNNaker-allocserv/pom.xml') }}
           restore-keys: ${{ runner.os }}-node-
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3.13.0
+        uses: actions/setup-java@v4.0.0
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
@@ -70,7 +72,7 @@ jobs:
           touch $SITE_DIR/.nojekyll
 
       - name: Deploy to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@v4.4.3
+        uses: JamesIves/github-pages-deploy-action@v4.5.0
         with:
           branch: gh-pages
           folder: ${{ env.SITE_DIR }}

diff --git a/SpiNNaker-allocserv/pom.xml b/SpiNNaker-allocserv/pom.xml
@@ -81,9 +81,9 @@ limitations under the License.
 						<id>make-project-output-directory</id>
 						<phase>initialize</phase>
 						<configuration>
-							<tasks>
+							<target>
 								<mkdir dir="${project.build.directory}/generated-resources"/>
-							</tasks>
+							</target>
 						</configuration>
 						<goals>
 							<goal>run</goal>
@@ -507,6 +507,11 @@ limitations under the License.
 			<artifactId>testcontainers</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<description>A board allocation service for SpiNNaker.</description>