Merge remote-tracking branch 'origin/master' into update_contrib_2

.github/workflows/main.yml

@@ -18,45 +18,24 @@ jobs:
     name: base
     runs-on: ubuntu-latest
     steps:
-      - name: checkout code
+      - uses: actions/checkout@v3
-        uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
-          fetch-depth: 1
-
       - name: build
-        uses: nick-fields/retry@v2
+        run: make base
-        with:
-          timeout_minutes: 120
-          retry_wait_seconds: 40
-          max_attempts: 3
-          retry_on: error
-          command: make base
-
       - name: test
         run: make base.test
-
       - name: archive base
         run: |
           mkdir -p cache
           docker save dockcross/base:latest | xz -e9 -T0 > ./cache/base.tar.xz
-
       - name: save base
         uses: actions/upload-artifact@v3
         with:
           name: cache
           path: ./cache
           retention-days: 1
-
       - name: deploy
         if: github.ref == 'refs/heads/master'
-        uses: nick-fields/retry@v2
+        run: |
-        with:
-          timeout_minutes: 30
-          retry_wait_seconds: 30
-          max_attempts: 4
-          retry_on: error
-          command: |
           docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
           docker image push dockcross/base --all-tags
 
@@ -854,56 +833,39 @@ jobs:
               cpython_arg: "",
             }
     steps:
-      - name: checkout code
+      - uses: actions/checkout@v3
-        uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
-          fetch-depth: 1
-
       - uses: actions/download-artifact@v3
         with:
           name: cache
           path: ./cache
-
       - name: load base
         run: xz -d -k < ./cache/base.tar.xz | docker load
-
       - name: build
-        uses: nick-fields/retry@v2
+        run: make ${{ matrix.arch_name.image }}
-        with:
-          timeout_minutes: 360
-          retry_wait_seconds: 20
-          max_attempts: 3
-          retry_on: error
-          command: make ${{ matrix.arch_name.image }}
-
       - name: basic test
         run: make ${{ matrix.arch_name.image }}.test
-
+      # Updated on 28/08/2021
-      # Updated on 19/05/2022
       - name: stockfish build test
         if: ${{ matrix.arch_name.stockfish == 'yes' }}
         run: |
-          git clone --depth 1 --branch sf_15 https://github.com/official-stockfish/Stockfish.git
+          git clone --depth 1 --branch sf_14 https://github.com/official-stockfish/Stockfish.git
           cd Stockfish/src
           ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} net
           ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} build ${{ matrix.arch_name.stockfish_arg }} -j2
           cd ../..
           rm -rf Stockfish
-      # Updated on 19/05/2022
+      # Updated on 28/08/2021
-
       - name: ninja build test
         if: ${{ matrix.arch_name.ninja == 'yes' }}
         run: |
-          git clone --depth 1 --branch v1.11.0 https://github.com/ninja-build/ninja.git
+          git clone --depth 1 --branch v1.10.2 https://github.com/ninja-build/ninja.git
           cd ninja
           ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.ninja_arg }}
-
+      # Updated on 28/08/2021
-      # Updated on 19/05/2022
       - name: openssl build test
         if: ${{ matrix.arch_name.openssl == 'yes' }}
         run: |
-          git clone --depth 1 --branch OpenSSL_1_1_1o https://github.com/openssl/openssl.git
+          git clone --depth 1 --branch OpenSSL_1_1_1k https://github.com/openssl/openssl.git
           cd openssl
           wget https://raw.githubusercontent.com/mavlink/MAVSDK/main/third_party/openssl/dockcross-android.patch
           patch -p 0 < dockcross-android.patch
@@ -911,58 +873,47 @@ jobs:
           ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2
           cd ..
           rm -rf openssl
-
+      # Updated on 28/08/2021
-      # Updated on 19/05/2022
       - name: C build test
         if: ${{ matrix.arch_name.C == 'yes' }}
         run: |
           git clone https://github.com/TheAlgorithms/C.git
           cd C
-          git checkout 2314a195862243e09c485a66194866517a6f8c31
+          git checkout cc241f58c253c533ac94e07151ef91a5ef7e5719
           ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C_arg }}
           cd ..
           rm -rf C
-
+      # Updated on 28/08/2021
-      # Updated on 19/05/2022
       - name: C-Plus-Plus build test
         if: ${{ matrix.arch_name.C-Plus-Plus == 'yes' }}
         run: |
           git clone https://github.com/TheAlgorithms/C-Plus-Plus.git
           cd C-Plus-Plus
-          git checkout 37a29008e6b77921a97a89ca8b7fd9e700aeccd0
+          git checkout c3b07aed2240e5364e1a49d091a00b61f520e653
           ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C-Plus-Plus_arg }}
           cd ..
           rm -rf C-Plus-Plus
-
+      # Updated on 28/08/2021
-      # Updated on 19/05/2022
       - name: fmt build test
         if: ${{ matrix.arch_name.fmt == 'yes' }}
         run: |
-          git clone --depth 1 --branch 8.1.1 https://github.com/fmtlib/fmt.git
+          git clone --depth 1 --branch 8.0.1 https://github.com/fmtlib/fmt.git
           cd fmt
           ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.fmt_arg }} -DFMT_DOC=OFF
           cd ..
           rm -rf fmt
-
+      # Updated on 05/10/2021
-      # Updated on 19/05/2022
       - name: cpython build test
         if: ${{ matrix.arch_name.cpython == 'yes' }}
         run: |
-          git clone --depth 1 --branch v3.9.13 https://github.com/python/cpython.git
+          git clone --depth 1 --branch v3.9.2 https://github.com/python/cpython.git
           cd cpython
           ./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./configure ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no --disable-ipv6 ${{ matrix.arch_name.cpython_arg }} --build=x86_64-linux-gnu --enable-shared
           ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2
           cd ..
           rm -rf cpython
-
       - name: deploy
         if: github.ref == 'refs/heads/master'
-        uses: nick-fields/retry@v2
+        run: |
-        with:
-          timeout_minutes: 30
-          retry_wait_seconds: 30
-          max_attempts: 4
-          retry_on: error
-          command: |
           docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
           docker image push dockcross/${{ matrix.arch_name.image }} --all-tags

CONTRIBUTING.md

@@ -189,7 +189,7 @@ Once this part is finished, there must be 3 files in the **linux-arm64** folder:
 - **Dockerfile.in**, the docker file.
 - **Toolchain.cmake**, the CMake file for the toolchains.
 
-### Makefile
+### Makefile and CI
 
 For this last part, we will see how to add the image to the [Makefile](Makefile) and to a github action.
 
@@ -225,42 +225,6 @@ GEN_IMAGES = android-arm android-arm64 \
 	linux-riscv64 linux-riscv32 linux-m68k-uclibc linux-x64-tinycc linux-xtensa-uclibc
 ```
 
-### Image building and testing
-
-You can now start building the image:
-
-```bash
-make linux-arm64
-```
-
-When finished, you can test it:
-
-```bash
-make linux-arm64.test
-```
-
-If you want to go a little further in the tests:
-
-```bash
-docker run --rm linux-arm64 > ./linux-arm64
-chmod +x ./linux-arm64
-```
-
-And then run the commands to build a project (you must be in the directory of your project to build):
-
-```bash
-./linux-arm64 make
-```
-
-With CMake + Ninja:
-
-```bash
-./linux-arm64 cmake -Bbuild -S. -GNinja
-./linux-arm64 ninja -Cbuild
-```
-
-### CI (github action)
-
 To finish, you have to add to [Github Action](.github/workflows/main.yml) the image/folder name:
 
 ```yml

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015, 2016, 2017, 2018, 2021 Steeve Morin, Rob Burns, Matthew McCormick, Jean-Christophe-Fillion-Robin, Bensuperpc
+Copyright (c) 2015, 2016, 2017, 2018 Steeve Morin, Rob Burns, Matthew McCormick, Jean-Christophe-Fillion-Robin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -25,7 +25,7 @@ Cross compiling toolchains in Docker images.
 ## Examples
 
 1. `dockcross make`: Build the *Makefile* in the current directory.
-2. `dockcross cmake -Bbuild -S. -GNinja`: Run CMake with a build directory `./build` for a *CMakeLists.txt* file in the current directory and generate `ninja` build configuration files.
+2. `dockcross cmake -Bbuild -H. -GNinja`: Run CMake with a build directory `./build` for a *CMakeLists.txt* file in the current directory and generate `ninja` build configuration files.
 3. `dockcross ninja -Cbuild`: Run ninja in the `./build` directory.
 4. `dockcross bash -c '$CC test/C/hello.c -o hello'`: Build the *hello.c* file with the compiler identified with the `CC` environmental variable in the build environment.
 5. `dockcross bash`: Run an interactive shell in the build environment.