diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bffe12ca13..686816927a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: os: linux-gcc-14 builder: ubuntu-24.04 shell: bash - - target: + - platform: os: macos builder: macos-13 shell: bash @@ -58,55 +58,60 @@ jobs: name: '${{ matrix.platform.os }}-${{ matrix.platform.cpu }} (Nim ${{ matrix.nim.branch }})' runs-on: ${{ matrix.builder }} steps: - - name: Checkout - uses: actions/checkout@v4 - with: - submodules: true + - name: + run: | + echo ${{ matrix.builder }} - - name: Setup Nim - uses: "./.github/actions/install_nim" - with: - os: ${{ matrix.platform.os }} - cpu: ${{ matrix.platform.cpu }} - shell: ${{ matrix.shell }} - nim_branch: ${{ matrix.nim.branch }} + # steps: + # - name: Checkout + # uses: actions/checkout@v4 + # with: + # submodules: true - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: '~1.15.5' + # - name: Setup Nim + # uses: "./.github/actions/install_nim" + # with: + # os: ${{ matrix.platform.os }} + # cpu: ${{ matrix.platform.cpu }} + # shell: ${{ matrix.shell }} + # nim_branch: ${{ matrix.nim.branch }} - - name: Install p2pd - run: | - V=1 bash scripts/build_p2pd.sh p2pdCache 124530a3 + # - name: Setup Go + # uses: actions/setup-go@v5 + # with: + # go-version: '~1.15.5' - - name: Restore deps from cache - id: deps-cache - uses: actions/cache@v3 - with: - path: nimbledeps - # Using nim.branch as a simple way to differentiate between nimble using the "pkgs" or "pkgs2" directories. - # The change happened on Nimble v0.14.0. - key: nimbledeps-${{ matrix.nim.branch }}-${{ hashFiles('.pinned') }} # hashFiles returns a different value on windows + # - name: Install p2pd + # run: | + # V=1 bash scripts/build_p2pd.sh p2pdCache 124530a3 - - name: Install deps - if: ${{ steps.deps-cache.outputs.cache-hit != 'true' }} - run: | - nimble install_pinned + # - name: Restore deps from cache + # id: deps-cache + # uses: actions/cache@v3 + # with: + # path: nimbledeps + # # Using nim.branch as a simple way to differentiate between nimble using the "pkgs" or "pkgs2" directories. + # # The change happened on Nimble v0.14.0. + # key: nimbledeps-${{ matrix.nim.branch }}-${{ hashFiles('.pinned') }} # hashFiles returns a different value on windows - - name: Use gcc 14 - if : ${{ matrix.target.os == 'linux-gcc-14'}} - run: | - # Add GCC-14 to alternatives - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 14 + # - name: Install deps + # if: ${{ steps.deps-cache.outputs.cache-hit != 'true' }} + # run: | + # nimble install_pinned - # Set GCC-14 as the default - sudo update-alternatives --set gcc /usr/bin/gcc-14 + # - name: Use gcc 14 + # if : ${{ matrix.platform.os == 'linux-gcc-14'}} + # run: | + # # Add GCC-14 to alternatives + # sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 14 - - name: Run tests - run: | - nim --version - nimble --version - gcc --version - NIMFLAGS="${NIMFLAGS} --mm:${{ matrix.nim.memory_management }}" - nimble test + # # Set GCC-14 as the default + # sudo update-alternatives --set gcc /usr/bin/gcc-14 + + # - name: Run tests + # run: | + # nim --version + # nimble --version + # gcc --version + # NIMFLAGS="${NIMFLAGS} --mm:${{ matrix.nim.memory_management }}" + # nimble test