fix annotate

mpromonet · Sep 10, 2024 · 557826e · 557826e
1 parent 54cf1c4
commit 557826e
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 59 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -84,64 +84,13 @@ linuxarm64_docker_builder:
     docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
     docker push $CIRRUS_REPO_FULL_NAME:${TAG}-arm64
 
-windows_docker_builder:    
-  only_if: $CIRRUS_TAG == '' && $CIRRUS_BRANCH != 'master'
-  timeout_in: 120m
-  platform: windows
-  os_version: 2019  
-  env:
-    DOCKERHUB_USER: ENCRYPTED[ccd1af2835558f6b3e08fa3dd8ad95e7b3eaf3b83220433093d6335a3f4727f4c53c4053587d1594799e72e331d1017d]
-    DOCKERHUB_PASS: ENCRYPTED[864955f576fec35ebe9ebb2102689412213437cf0db640570b886bdf6369950dacbb77c7c9e690a720607a87e7ea3b18]
-    CIRRUS_CLONE_DEPTH: 100
-  script: |
-    docker info
-    set TAG=%CIRRUS_BRANCH%
-    docker build --no-cache -t %CIRRUS_REPO_FULL_NAME%:%TAG%-windows . -f Dockerfile.windows
-    docker login --username=%DOCKERHUB_USER% --password=%DOCKERHUB_PASS% 
-    docker push %CIRRUS_REPO_FULL_NAME%:%TAG%-windows   
-
-windowsbranch_docker_builder:    
-  only_if: $CIRRUS_TAG == '' && $CIRRUS_BRANCH == 'master'
-  timeout_in: 120m
-  platform: windows
-  os_version: 2019 
-  env:
-    DOCKERHUB_USER: ENCRYPTED[ccd1af2835558f6b3e08fa3dd8ad95e7b3eaf3b83220433093d6335a3f4727f4c53c4053587d1594799e72e331d1017d]
-    DOCKERHUB_PASS: ENCRYPTED[864955f576fec35ebe9ebb2102689412213437cf0db640570b886bdf6369950dacbb77c7c9e690a720607a87e7ea3b18]
-    CIRRUS_CLONE_DEPTH: 100
-  script: |
-    docker info
-    set TAG=latest
-    docker build --no-cache -t %CIRRUS_REPO_FULL_NAME%:%TAG%-windows . -f Dockerfile.windows
-    docker login --username=%DOCKERHUB_USER% --password=%DOCKERHUB_PASS% 
-    docker push %CIRRUS_REPO_FULL_NAME%:%TAG%-windows   
-
-windowstag_docker_builder:
-  only_if: $CIRRUS_TAG != ''
-  timeout_in: 120m
-  platform: windows
-  os_version: 2019
-  env:
-    DOCKERHUB_USER: ENCRYPTED[ccd1af2835558f6b3e08fa3dd8ad95e7b3eaf3b83220433093d6335a3f4727f4c53c4053587d1594799e72e331d1017d]
-    DOCKERHUB_PASS: ENCRYPTED[864955f576fec35ebe9ebb2102689412213437cf0db640570b886bdf6369950dacbb77c7c9e690a720607a87e7ea3b18]
-    CIRRUS_CLONE_DEPTH: 100
-  script: |
-    docker info
-    set TAG=%CIRRUS_TAG%
-    docker build --no-cache -t %CIRRUS_REPO_FULL_NAME%:%TAG%-windows . -f Dockerfile.windows
-    docker login --username=%DOCKERHUB_USER% --password=%DOCKERHUB_PASS%
-    docker push %CIRRUS_REPO_FULL_NAME%:%TAG%-windows
-
     
 publish_docker_builder:
   depends_on: 
     - linuxarmv6
     - linuxarmv7
     - linuxarm64
     - linux
-    - windows
-    - windowsbranch
-    - windowstag
   env:
     DOCKER_CLI_EXPERIMENTAL: enabled
     DOCKERHUB_USER: ENCRYPTED[ccd1af2835558f6b3e08fa3dd8ad95e7b3eaf3b83220433093d6335a3f4727f4c53c4053587d1594799e72e331d1017d]
@@ -150,7 +99,7 @@ publish_docker_builder:
     docker info
     export TAG=${CIRRUS_TAG:-latest}
     docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS 
-    docker manifest create --amend $CIRRUS_REPO_FULL_NAME:${TAG} $CIRRUS_REPO_FULL_NAME:${TAG}-amd64 $CIRRUS_REPO_FULL_NAME:${TAG}-armv7 $CIRRUS_REPO_FULL_NAME:${TAG}-armv6 $CIRRUS_REPO_FULL_NAME:${TAG}-windows $CIRRUS_REPO_FULL_NAME:${TAG}-arm64
+    docker manifest create --amend $CIRRUS_REPO_FULL_NAME:${TAG} $CIRRUS_REPO_FULL_NAME:${TAG}-amd64 $CIRRUS_REPO_FULL_NAME:${TAG}-armv7 $CIRRUS_REPO_FULL_NAME:${TAG}-armv6 $CIRRUS_REPO_FULL_NAME:${TAG}-arm64
     docker manifest annotate $CIRRUS_REPO_FULL_NAME:${TAG} $CIRRUS_REPO_FULL_NAME:${TAG}-armv7 --os linux --arch arm --variant v7
     docker manifest annotate $CIRRUS_REPO_FULL_NAME:${TAG} $CIRRUS_REPO_FULL_NAME:${TAG}-armv6 --os linux --arch arm --variant v6l
     docker manifest push $CIRRUS_REPO_FULL_NAME:${TAG} -p
diff --git a/.github/workflows/cpp-cross-linux-rpi.yml b/.github/workflows/cpp-cross-linux-rpi.yml
@@ -1,4 +1,4 @@
-name: C/C++ CI linux cross armv6/armv7
+name: C/C++ CI linux cross armv6/armv7/arm64
 
 on: [push]
 
@@ -8,17 +8,38 @@ jobs:
       matrix:
         include:
         - buildtype: Debug
+          archtype: arm
           arch: armv6l
           crosscompiler: https://sourceforge.net/projects/raspberry-pi-cross-compilers/files/Raspberry%20Pi%20GCC%20Cross-Compiler%20Toolchains/Buster/GCC%2010.2.0/Raspberry%20Pi%201%2C%20Zero/cross-gcc-10.2.0-pi_0-1.tar.gz
+          prefix: arm-linux-gnueabihf
+
         - buildtype: Release
+          archtype: arm
           arch: armv6l
           crosscompiler: https://sourceforge.net/projects/raspberry-pi-cross-compilers/files/Raspberry%20Pi%20GCC%20Cross-Compiler%20Toolchains/Buster/GCC%2010.2.0/Raspberry%20Pi%201%2C%20Zero/cross-gcc-10.2.0-pi_0-1.tar.gz
+          prefix: arm-linux-gnueabihf
+
         - buildtype: Debug
+          archtype: arm
           arch: armv7l
           crosscompiler: https://sourceforge.net/projects/raspberry-pi-cross-compilers/files/Raspberry%20Pi%20GCC%20Cross-Compiler%20Toolchains/Buster/GCC%2010.2.0/Raspberry%20Pi%202%2C%203/cross-gcc-10.2.0-pi_2-3.tar.gz
+          prefix: arm-linux-gnueabihf
+
         - buildtype: Release
+          archtype: arm
           arch: armv7l
           crosscompiler: https://sourceforge.net/projects/raspberry-pi-cross-compilers/files/Raspberry%20Pi%20GCC%20Cross-Compiler%20Toolchains/Buster/GCC%2010.2.0/Raspberry%20Pi%202%2C%203/cross-gcc-10.2.0-pi_2-3.tar.gz                
+          prefix: arm-linux-gnueabihf
+
+        - buildtype: Debug
+          archtype: arm64
+          arch: arm64
+          prefix: aarch64-linux-gnu
+
+        - buildtype: Release
+          archtype: arm64
+          arch: arm64
+          prefix: aarch64-linux-gnu
 
     runs-on: ubuntu-latest
 
@@ -29,8 +50,12 @@ jobs:
       run: | 
         sudo apt-get update 
         sudo apt-get install -y --no-install-recommends g++ autoconf automake libtool xz-utils cmake p7zip-full
-        wget -qO- ${{ matrix.crosscompiler }} | tar xz
-        echo "$(pwd)/$(ls -d cross-pi-gcc-*)/bin" >> $GITHUB_PATH
+        if [ -z "${{ matrix.crosscompiler }}" ]; then
+          sudo apt-get install -y --no-install-recommends gcc-${{ matrix.prefix }} g++-${{ matrix.prefix }}
+        else
+          wget -qO- ${{ matrix.crosscompiler }} | tar xz
+          echo "$(pwd)/$(ls -d cross-pi-gcc-*)/bin" >> $GITHUB_PATH
+        fi
 
     - name: depot_tools
       run: |
@@ -42,14 +67,14 @@ jobs:
           mkdir webrtc
           pushd webrtc
           fetch --no-history --nohooks webrtc
-          ./src/build/linux/sysroot_scripts/install-sysroot.py --arch=arm
+          ./src/build/linux/sysroot_scripts/install-sysroot.py --arch=${{ matrix.archtype }}
           sed -i -e "s|'src/resources'],|'src/resources'],'condition':'rtc_include_tests==true',|" src/DEPS 
           gclient sync 
           popd
 
     - name: build
       run: |
-          cmake -DWEBRTCROOT=$(pwd)/webrtc -DCMAKE_BUILD_TYPE=${{ matrix.buildtype }} -DCMAKE_SYSTEM_PROCESSOR=${{ matrix.arch }} -DCMAKE_LIBRARY_ARCHITECTURE=arm-linux-gnueabihf -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_C_COMPILER=arm-linux-gnueabihf-gcc -DCMAKE_CXX_COMPILER=arm-linux-gnueabihf-g++ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY -DWEBRTCDESKTOPCAPTURE=OFF .
+          cmake -DWEBRTCROOT=$(pwd)/webrtc -DCMAKE_BUILD_TYPE=${{ matrix.buildtype }} -DCMAKE_SYSTEM_PROCESSOR=${{ matrix.arch }} -DCMAKE_LIBRARY_ARCHITECTURE=${{ matrix.prefix }} -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_C_COMPILER=${{ matrix.prefix }}-gcc -DCMAKE_CXX_COMPILER=${{ matrix.prefix }}-g++ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY -DWEBRTCDESKTOPCAPTURE=OFF .
           make
 
     - name: cpack 

diff --git a/.github/workflows/cpp-docker.yml b/.github/workflows/cpp-docker.yml
@@ -60,6 +60,6 @@ jobs:
         export MANIFEST=${TAG}
         [ "$TAG" == "master" ] && export MANIFEST=latest 
         docker manifest create --amend docker.io/${{ github.repository }}:${MANIFEST} docker.io/${{ github.repository }}:${TAG}-amd64 docker.io/${{ github.repository }}:${TAG}-armv7l docker.io/${{ github.repository }}:${TAG}-armv6l docker.io/${{ github.repository }}:${TAG}-windows docker.io/${{ github.repository }}:${TAG}-arm64
-        docker manifest annotate docker.io/${{ github.repository }}:${TAG}-armv7l --os linux --arch arm --variant v7
-        docker manifest annotate docker.io/${{ github.repository }}:${TAG}-armv6l --os linux --arch arm --variant v6l
+        docker manifest annotate docker.io/${{ github.repository }}:${MANIFEST} docker.io/${{ github.repository }}:${TAG}-armv7l --os linux --arch arm --variant v7
+        docker manifest annotate docker.io/${{ github.repository }}:${MANIFEST} docker.io/${{ github.repository }}:${TAG}-armv6l --os linux --arch arm --variant v6l
         docker manifest push docker.io/${{ github.repository }}:${MANIFEST} -p