From 7e11d655d1963941fade013d7e5bed6f48bf8fac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jun 2026 11:42:31 +0000 Subject: [PATCH] Bump actions/checkout from 6 to 7 Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] (cherry picked from commit 4cd43b72e8dca764dcd9130a3f6f780da3656037) # Conflicts: # .github/workflows/cmake.yml # .github/workflows/linux-container.yml # .github/workflows/linux.yml # .github/workflows/windows.yml --- .github/workflows/cmake.yml | 82 ++++++++++++++++++++++++ .github/workflows/face.yml | 4 +- .github/workflows/fuzz.yml | 2 +- .github/workflows/linux-container.yml | 6 ++ .github/workflows/linux.yml | 7 +++ .github/workflows/macosx.yml | 4 +- .github/workflows/windows.yml | 89 ++++++++++++++++++++++++++- 7 files changed, 187 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/cmake.yml diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml new file mode 100644 index 0000000000000..a7dd8dcb3b88b --- /dev/null +++ b/.github/workflows/cmake.yml @@ -0,0 +1,82 @@ +name: cmake + +on: + push: + pull_request: + schedule: + - cron: '0 1 * * SUN' + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +permissions: + contents: read + +jobs: + build: + strategy: + fail-fast: false + matrix: + include: + - CC: gcc-12 + CXX: g++-12 + PackageDeps: g++-12 + os: ubuntu-22.04 + - CC: vs2022 + CXX: vs2022 + os: windows-2022 + runs-on: ${{ matrix.os }} + name: ${{ matrix.os }} ${{ matrix.CXX }} + env: + ACE_ROOT: ${{ github.workspace }}/ACE + MPC_ROOT: ${{ github.workspace }}/MPC + CC: ${{ matrix.CC }} + CXX: ${{ matrix.CXX }} + steps: + - name: checkout ACE/TAO + uses: actions/checkout@v7 + - name: checkout MPC + uses: actions/checkout@v7 + with: + repository: DOCGroup/MPC + path: ${{ env.MPC_ROOT }} + - name: Add Repo + run: | + wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - + sudo apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ ${{ matrix.Repo }} main" + if: matrix.Repo != '' + - name: Add packages + run: | + sudo apt-get --yes update + sudo apt-get --yes install ${{ matrix.PackageDeps }} + if: matrix.PackageDeps != '' + - name: create $ACE_ROOT/ace/config.h + run: | + '#ifdef linux' > ${env:ACE_ROOT}/ace/config.h + '# include "ace/config-linux.h"' >> ${env:ACE_ROOT}/ace/config.h + '#else' >> ${env:ACE_ROOT}/ace/config.h + '# include "ace/config-win32.h"' >> ${env:ACE_ROOT}/ace/config.h + '#endif' >> ${env:ACE_ROOT}/ace/config.h + shell: pwsh + - name: Run mwc.pl on $(ACE_ROOT)/ace/ace.mwc + run: | + perl ${env:ACE_ROOT}/bin/mwc.pl -type cmake ${env:ACE_ROOT}/ace/ace.mwc -workers 6 + shell: pwsh + - name: Run mwc.pl on $(ACE_ROOT)/apps/gperf/src + run: | + perl ${env:ACE_ROOT}/bin/mwc.pl -type cmake ${env:ACE_ROOT}/apps/gperf/src + shell: pwsh + - name: Build ace project + run: | + cd ${env:ACE_ROOT}/ace + cmake -S . -B build + cmake --build build -j6 + shell: pwsh + - name: Build ACE/apps/gperf/src project + run: | + cd ${env:ACE_ROOT}/apps/gperf/src + cmake -S . -B build + cmake --build build -j6 + shell: pwsh diff --git a/.github/workflows/face.yml b/.github/workflows/face.yml index 40c82d48bd839..89680551913c8 100644 --- a/.github/workflows/face.yml +++ b/.github/workflows/face.yml @@ -32,9 +32,9 @@ jobs: CXX: ${{ matrix.CXX }} steps: - name: checkout ACE/TAO - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: checkout MPC - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: repository: DOCGroup/MPC path: ${{ env.MPC_ROOT }} diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml index 238e31246e0a0..d1544ae8ae1db 100644 --- a/.github/workflows/fuzz.yml +++ b/.github/workflows/fuzz.yml @@ -20,7 +20,7 @@ jobs: steps: - name: checkout ACE/TAO - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Run fuzz run: | perl ${env:ACE_ROOT}/bin/fuzz.pl diff --git a/.github/workflows/linux-container.yml b/.github/workflows/linux-container.yml index 2a9f510262134..4667e24c23cc6 100644 --- a/.github/workflows/linux-container.yml +++ b/.github/workflows/linux-container.yml @@ -26,9 +26,15 @@ jobs: MPC_ROOT: ${{ github.workspace }}/MPC steps: - name: Checkout ACE_TAO +<<<<<<< HEAD uses: actions/checkout@v4 - name: Checkout MPC uses: actions/checkout@v4 +======= + uses: actions/checkout@v7 + - name: Checkout MPC + uses: actions/checkout@v7 +>>>>>>> 4cd43b72e8 (Bump actions/checkout from 6 to 7) with: repository: DOCGroup/MPC path: ${{ env.MPC_ROOT }} diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f31fd2f3be77f..6ac8ebb44fcc1 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -101,10 +101,17 @@ jobs: CC: ${{ matrix.CC }} CXX: ${{ matrix.CXX }} steps: +<<<<<<< HEAD - name: checkout ACE/TAO uses: actions/checkout@v6 - name: checkout MPC uses: actions/checkout@v6 +======= + - name: Checkout ACE_TAO + uses: actions/checkout@v7 + - name: Checkout MPC + uses: actions/checkout@v7 +>>>>>>> 4cd43b72e8 (Bump actions/checkout from 6 to 7) with: repository: DOCGroup/MPC path: ${{ env.MPC_ROOT }} diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml index 6c8625dbd5056..a31289d901c67 100644 --- a/.github/workflows/macosx.yml +++ b/.github/workflows/macosx.yml @@ -28,9 +28,9 @@ jobs: MPC_ROOT: ${{ github.workspace }}/MPC steps: - name: checkout ACE/TAO - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: checkout MPC - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: repository: DOCGroup/MPC path: ${{ env.MPC_ROOT }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 847ebf2ed28f4..ea1f3882ee71a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -75,9 +75,9 @@ jobs: VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg_installed steps: - name: checkout ACE/TAO - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: checkout MPC - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: repository: DOCGroup/MPC path: ${{ env.MPC_ROOT }} @@ -127,3 +127,88 @@ jobs: run: msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} ACE/tests/tests.sln - name: Build solution TAO/tests/IDL_Test/IDL_Test.sln run: msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} TAO/tests/IDL_Test/IDL_Test.sln +<<<<<<< HEAD +======= + mingw: + runs-on: windows-2022 + strategy: + fail-fast: false + matrix: + compiler: [gcc] + msystem: [MINGW64] + include: + - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_mingw32.GNU + name: ${{ matrix.msystem }}-${{ matrix.compiler }} + env: + ACE_ROOT: ${{ github.workspace }}/ACE + TAO_ROOT: ${{ github.workspace }}/TAO + MPC_ROOT: ${{ github.workspace }}/MPC + steps: + - name: checkout ACE/TAO + uses: actions/checkout@v7 + - name: checkout MPC + uses: actions/checkout@v7 + with: + repository: DOCGroup/MPC + path: ${{ env.MPC_ROOT }} + - uses: msys2/setup-msys2@v2 + with: + msystem: ${{ matrix.msystem }} + install: make + - run: pacman --noconfirm -S mingw-w64-x86_64-${{ matrix.compiler }} + shell: msys2 {0} + - run: ${{ matrix.compiler }} --version + shell: msys2 {0} + - name: create $ACE_ROOT/ace/config.h + run: | + '#include "ace/config-win32.h"' > ${env:ACE_ROOT}/ace/config.h + shell: pwsh + - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features + run: | + echo "versioned_namespace=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + shell: pwsh + - name: Add optional features ${{ matrix.OptionalFeatures }} + run: | + echo "${{ matrix.OptionalFeatures }}" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + shell: pwsh + if: matrix.OptionalFeatures != '' + - name: add optional optional macros + run: | + '${{ matrix.optional_macros }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + shell: pwsh + if: matrix.optional_macros != '' + - name: extend $ACE_ROOT/include/makeinclude/platform_macros.GNU + run: | + '${{ matrix.platform_file }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + shell: pwsh + - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc + run: | + perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4 + shell: pwsh + - name: Run mwc.pl on $(ACE_ROOT)/tests/tests.mwc + run: | + perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:ACE_ROOT}/tests/tests.mwc -workers 4 + shell: pwsh + - name: Run mwc.pl on $(TAO_ROOT)/tests/IDL_Test + run: | + perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/tests/IDL_Test -workers 4 + shell: pwsh + - name: Build TAO_ACE project + run: | + export ACE_ROOT=`cygpath -u $ACE_ROOT` + export TAO_ROOT=`cygpath -u $TAO_ROOT` + make -j 6 -C $TAO_ROOT + shell: msys2 {0} + - name: Build ACE/tests project + run: | + export ACE_ROOT=`cygpath -u $ACE_ROOT` + export TAO_ROOT=`cygpath -u $TAO_ROOT` + make -j 6 -C $ACE_ROOT/tests + shell: msys2 {0} + - name: Build TAO/tests/IDL_Test project + run: | + export ACE_ROOT=`cygpath -u $ACE_ROOT` + export TAO_ROOT=`cygpath -u $TAO_ROOT` + make -j 6 -C $TAO_ROOT/tests/IDL_Test + shell: msys2 {0} +>>>>>>> 4cd43b72e8 (Bump actions/checkout from 6 to 7)