Kill remaining traces of win32 support.

[simgrid.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8dc6d7..583e9d5 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ ctest:
   - stable
   script:
   - apt-get --allow-releaseinfo-change update
-  - apt install -y xsltproc
+  - apt install -y binutils xsltproc
   - cmake -Denable_model-checking=OFF -Denable_documentation=OFF -Denable_coverage=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_compile_warnings=ON -DLTO_EXTRA_FLAG="auto" .
   - make -j$(nproc) VERBOSE=1 all tests
   - ctest -T Test -j$(nproc) --output-on-failure
@@ -31,7 +31,7 @@ release:
   - stable
   script:
   - apt-get --allow-releaseinfo-change update
-  - apt install -y binutils-x86-64-linux-gnu wget unzip zip
+  - apt install -y binutils wget unzip zip
   # Build the linux version of the jarfile without the boost dependency
   - cmake -Denable_documentation=OFF -Denable_java=ON -Denable_msg=ON -Denable_lib_in_jar=ON -Dminimal-bindings=ON -Denable_compile_optimizations=ON -Denable_smpi=OFF -DLTO_EXTRA_FLAG="auto" .
   - make VERBOSE=1 -j$(nproc) dist simgrid simgrid-java_jar
@@ -39,12 +39,11 @@ release:
 # Please use the github action instead
 #  - make VERBOSE=1 -j$(nproc) dist simgrid simgrid-java_jar
 #  # Get the foreign architectures
-#  - wget https://ci.appveyor.com/api/projects/mquinson/simgrid/artifacts/simgrid.jar -O simgrid-windows.jar
 #  - export SGVER=`grep SimGrid ChangeLog|head -n1|sed -e 's/SimGrid (//' -e 's/).*//'`
 #  - wget https://ci.inria.fr/simgrid/job/SimGrid/build_mode=Debug,node=macos/lastSuccessfulBuild/artifact/build/simgrid-${SGVER}/build/simgrid.jar -O simgrid-mac.jar
 #  # Open all jar files, and strip them
 #  - mkdir content ; cd content
-#  - for j in  ../simgrid.jar ../simgrid-windows.jar ../simgrid-mac.jar ; do unzip -n $j ; done
+#  - for j in  ../simgrid.jar ../simgrid-mac.jar ; do unzip -n $j ; done
 #  - strip NATIVE/*/*/*.so
 #  - x86_64-linux-gnu-strip NATIVE/*/*/lib*dll
 #  - zip -r ../simgrid-${SGVER}.jar *
@@ -55,13 +54,12 @@ release:
 
 pip:
   image:
-    name: debian:testing
+    name: python:3-bullseye
     entrypoint: ['/bin/bash', '-c', 'ln -snf /bin/bash /bin/sh && /bin/bash -c $0' ]
   stage: build
   except:
   - stable
   script:
-  - chmod -v -R u=rwX,og=rX /etc/apt/trusted.gpg.d/
   - apt-get --allow-releaseinfo-change update
   - apt install -y python3-pip cmake libboost-dev g++ gcc pybind11-dev
   - python3 setup.py sdist