Louis-Philippe Véronneau pushed to branch bts_1080352 at lintian / lintian


Commits:
a60e951b by Otto Kekäläinen at 2024-09-11T17:00:22+00:00
Salsa CI: Remove unnecessary autopkgtest timeout check

The 'timeout: 3h' added in 2b05a303 already extends the job timeout. The
check will always return '3600' because of this, and is thus useless.

- - - - -
4995abc8 by Bas Couwenberg at 2024-09-11T19:43:21+00:00
Java 21 is now default. Closes: #1080352

- - - - -


2 changed files:

- data/java/constants
- debian/salsa-ci.yml


Changes:

=====================================
data/java/constants
=====================================
@@ -17,13 +17,16 @@
 #     62 -> Java18
 #     63 -> Java19
 #     64 -> Java20
-#     65 -> Java21 - highest version in Debian unstable
+#     65 -> Java21
+#     66 -> Java22
+#     67 -> Java23
+#     68 -> Java24 - highest version in Debian unstable
 
 # current default in Debian
-default-bytecode-version = 61
+default-bytecode-version = 65
 
 # highest known anywhere
-highest-known-bytecode-version = 65
+highest-known-bytecode-version = 68
 
 # The following should not change
 lowest-known-bytecode-version = 45


=====================================
debian/salsa-ci.yml
=====================================
@@ -29,15 +29,7 @@ lintian-git:
   - apt-get update
   - apt-get install -y ${WORKING_DIR}/lintian_*.deb
 
+# Extend Salsa-CI build jobs to have longer timeout as the default GitLab
+# timeout (1h) is often not enough.
 .test-autopkgtest: &test-autopkgtest
-  # Extend Salsa-CI build jobs to have longer timeout as the default GitLab
-  # timeout (1h) is often not enough.
   timeout: 3h
-  # Try to check whether the maximum job timeout is extended to longer one.
-  before_script:
-    - 'echo "CI/CD Settings / General pipelines / Timeout: $CI_JOB_TIMEOUT 
seconds"'
-    - |
-      if [[ $CI_JOB_TIMEOUT -le 3600 ]]; then
-        echo -e "\e[31;1mERROR: CI/CD Settings / General pipelines / Timeout 
is too short ($CI_JOB_TIMEOUT). Use longer timeout - e.g. 7200 (2h) is 
enough.\e[0m"
-        exit 1
-      fi



View it on GitLab: 
https://salsa.debian.org/lintian/lintian/-/compare/90b68b7f77a7dec7f91d3c26301813f15d68e803...4995abc8a0fa6a8b15526d207f5bc2f3f5ddb536

-- 
View it on GitLab: 
https://salsa.debian.org/lintian/lintian/-/compare/90b68b7f77a7dec7f91d3c26301813f15d68e803...4995abc8a0fa6a8b15526d207f5bc2f3f5ddb536
You're receiving this email because of your account on salsa.debian.org.


Reply via email to