From 8ddf39bd9138b95142f63adfe1bf5f67a329a430 Mon Sep 17 00:00:00 2001 From: Val Lorentz Date: Wed, 7 Jul 2021 21:05:14 +0200 Subject: [PATCH] Deduplicate Insp/Unreal/Anope builds (#77) --- .github/workflows/test-devel.yml | 460 +++++++++++++-------- .github/workflows/test-devel_release.yml | 410 ++++++++++++++---- .github/workflows/test-stable.yml | 506 ++++++++++++++--------- irctest/controllers/unrealircd.py | 3 +- make_workflows.py | 212 ++++++++-- workflows.yml | 60 ++- 6 files changed, 1136 insertions(+), 515 deletions(-) diff --git a/.github/workflows/test-devel.yml b/.github/workflows/test-devel.yml index 636f7cf..5ad45c2 100644 --- a/.github/workflows/test-devel.yml +++ b/.github/workflows/test-devel.yml @@ -2,10 +2,149 @@ # Do not edit it manually, modifications will be lost. jobs: + build-anope: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Create directories + run: cd ~/; mkdir -p .local/ go/ + - name: Checkout Anope + uses: actions/checkout@v2 + with: + path: anope + ref: 2.0.9 + repository: anope/anope + - name: Build Anope + run: |- + cd $GITHUB_WORKSPACE/anope/ + cp $GITHUB_WORKSPACE/data/anope/* . + CFLAGS=-O0 ./Config -quick + make -C build -j 4 + make -C build install + - name: Make artefact tarball + run: cd ~; tar -czf artefacts-anope.tar.gz .local/ go/ + - name: Upload build artefacts + uses: actions/upload-artifact@v2 + with: + name: installed-anope + path: ~/artefacts-*.tar.gz + retention-days: 1 + build-inspircd: + runs-on: ubuntu-latest + steps: + - name: Create directories + run: cd ~/; mkdir -p .local/ go/ + - uses: actions/checkout@v2 + - name: Set up Python 3.7 + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - name: Checkout InspIRCd + uses: actions/checkout@v2 + with: + path: inspircd + ref: master + repository: inspircd/inspircd + - name: Build InspIRCd + run: | + cd $GITHUB_WORKSPACE/inspircd/ + patch src/inspircd.cpp < $GITHUB_WORKSPACE/inspircd_mainloop.patch + ./configure --prefix=$HOME/.local/inspircd --development + make -j 4 + make install + - name: Make artefact tarball + run: cd ~; tar -czf artefacts-inspircd.tar.gz .local/ go/ + - name: Upload build artefacts + uses: actions/upload-artifact@v2 + with: + name: installed-inspircd + path: ~/artefacts-*.tar.gz + retention-days: 1 + build-solanum: + runs-on: ubuntu-latest + steps: + - name: Create directories + run: cd ~/; mkdir -p .local/ go/ + - name: Cache dependencies + uses: actions/cache@v2 + with: + key: ${{ runner.os }}-solanum-devel + path: |- + ~/.cache + $GITHUB_WORKSPACE/solanum + - uses: actions/checkout@v2 + - name: Set up Python 3.7 + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - name: Checkout Solanum + uses: actions/checkout@v2 + with: + path: solanum + ref: main + repository: solanum-ircd/solanum + - name: Build Solanum + run: | + cd $GITHUB_WORKSPACE/solanum/ + ./autogen.sh + ./configure --prefix=$HOME/.local/ + make -j 4 + make install + - name: Make artefact tarball + run: cd ~; tar -czf artefacts-solanum.tar.gz .local/ go/ + - name: Upload build artefacts + uses: actions/upload-artifact@v2 + with: + name: installed-solanum + path: ~/artefacts-*.tar.gz + retention-days: 1 + build-unrealircd: + runs-on: ubuntu-latest + steps: + - name: Create directories + run: cd ~/; mkdir -p .local/ go/ + - name: Cache dependencies + uses: actions/cache@v2 + with: + key: ${{ runner.os }}-unrealircd-devel + path: |- + ~/.cache + $GITHUB_WORKSPACE/unrealircd + - uses: actions/checkout@v2 + - name: Set up Python 3.7 + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - name: Checkout UnrealIRCd + uses: actions/checkout@v2 + with: + path: unrealircd + ref: unreal52 + repository: unrealircd/unrealircd + - name: Build UnrealIRCd + run: | + cd $GITHUB_WORKSPACE/unrealircd/ + cp $GITHUB_WORKSPACE/data/unreal/* . + # Need to use a specific -march, because GitHub has inconsistent + # architectures across workers, which result in random SIGILL with some + # worker combinations + sudo apt install libsodium-dev libargon2-dev + CFLAGS="-O0 -march=x86-64" CXXFLAGS="$CFLAGS" ./Config -quick + make -j 4 + make install + - name: Make artefact tarball + run: cd ~; tar -czf artefacts-unrealircd.tar.gz .local/ go/ + - name: Upload build artefacts + uses: actions/upload-artifact@v2 + with: + name: installed-unrealircd + path: ~/artefacts-*.tar.gz + retention-days: 1 publish-test-results: if: success() || failure() name: Publish Unit Tests Results needs: + - test-charybdis - test-solanum - test-ergo - test-inspircd @@ -24,7 +163,9 @@ jobs: uses: EnricoMi/publish-unit-test-result-action@v1 with: files: artifacts/**/*.xml - test-ergo: + test-charybdis: + needs: + - build-charybdis runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -32,42 +173,70 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - uses: actions/setup-go@v2 + - name: Download build artefacts + uses: actions/download-artifact@v2 with: - go-version: ~1.16 - - run: go version - - name: Cache dependencies - uses: actions/cache@v2 - with: - key: ${{ runner.os }}-ergo-devel - path: |- - ~/.cache - $GITHUB_WORKSPACE/ergo - - name: Install dependencies + name: installed-charybdis + path: '~' + - name: Unpack artefacts + run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies run: |- - sudo apt-get install atheme-services python -m pip install --upgrade pip pip install pytest -r requirements.txt + - name: Test with pytest + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH make + charybdis + - if: always() + name: Publish results + uses: actions/upload-artifact@v2 + with: + name: pytest results charybdis (devel) + path: pytest.xml + test-ergo: + needs: [] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3.7 + uses: actions/setup-python@v2 + with: + python-version: 3.7 - name: Checkout Ergo uses: actions/checkout@v2 with: path: ergo ref: master repository: ergochat/ergo + - uses: actions/setup-go@v2 + with: + go-version: ~1.16 + - run: go version - name: Build Ergo run: | cd $GITHUB_WORKSPACE/ergo/ make build make install + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies + run: |- + python -m pip install --upgrade pip + pip install pytest -r requirements.txt - name: Test with pytest - run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=~/go/bin:$PATH make ergo + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/go/bin:$PATH + make ergo - if: always() name: Publish results uses: actions/upload-artifact@v2 with: - name: pytest results Ergo (devel) + name: pytest results ergo (devel) path: pytest.xml test-inspircd: + needs: + - build-inspircd runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -75,34 +244,32 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - name: Install dependencies + - name: Download build artefacts + uses: actions/download-artifact@v2 + with: + name: installed-inspircd + path: '~' + - name: Unpack artefacts + run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies run: |- - sudo apt-get install atheme-services python -m pip install --upgrade pip pip install pytest -r requirements.txt - - name: Checkout InspIRCd - uses: actions/checkout@v2 - with: - path: inspircd - ref: master - repository: inspircd/inspircd - - name: Build InspIRCd - run: | - cd $GITHUB_WORKSPACE/inspircd/ - patch src/inspircd.cpp < $GITHUB_WORKSPACE/inspircd_mainloop.patch - ./configure --prefix=$HOME/.local/inspircd --development - make -j 4 - make install - name: Test with pytest - run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=~/.local/inspircd/bin:$PATH PYTEST_ARGS="$PYTEST_ARGS - -m 'not services'" make inspircd + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PYTEST_ARGS="$PYTEST_ARGS + -m 'not services'" PATH=~/.local/inspircd/bin:$PATH make inspircd - if: always() name: Publish results uses: actions/upload-artifact@v2 with: - name: pytest results InspIRCd (devel) + name: pytest results inspircd (devel) path: pytest.xml test-inspircd-anope: + needs: + - build-inspircd + - build-anope runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -110,47 +277,35 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - name: Install dependencies + - name: Download build artefacts + uses: actions/download-artifact@v2 + with: + name: installed-inspircd + path: '~' + - name: Download build artefacts + uses: actions/download-artifact@v2 + with: + name: installed-anope + path: '~' + - name: Unpack artefacts + run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies run: |- - sudo apt-get install atheme-services python -m pip install --upgrade pip pip install pytest -r requirements.txt - - name: Checkout InspIRCd - uses: actions/checkout@v2 - with: - path: inspircd - ref: master - repository: inspircd/inspircd - - name: Build InspIRCd - run: | - cd $GITHUB_WORKSPACE/inspircd/ - patch src/inspircd.cpp < $GITHUB_WORKSPACE/inspircd_mainloop.patch - ./configure --prefix=$HOME/.local/inspircd --development - make -j 4 - make install - - name: Checkout Anope - uses: actions/checkout@v2 - with: - path: anope - ref: 2.0.9 - repository: anope/anope - - name: Build Anope - run: |- - cd $GITHUB_WORKSPACE/anope/ - cp $GITHUB_WORKSPACE/data/anope/* . - CFLAGS=-O0 ./Config -quick - make -C build -j 4 - make -C build install - name: Test with pytest - run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=~/.local/inspircd/bin:$PATH make - inspircd-anope + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PYTEST_ARGS="$PYTEST_ARGS + -m 'not services'" PATH=~/.local/inspircd/bin:$PATH make inspircd-anope - if: always() name: Publish results uses: actions/upload-artifact@v2 with: - name: pytest results InspIRCd (devel) + name: pytest results anope (devel) path: pytest.xml test-limnoria: + needs: [] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -158,29 +313,26 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - name: Cache dependencies - uses: actions/cache@v2 - with: - key: ${{ runner.os }}-limnoria-devel - path: |- - ~/.cache - $GITHUB_WORKSPACE/placeholder - - name: Install dependencies - run: |- - sudo apt-get install atheme-services - python -m pip install --upgrade pip - pip install pytest -r requirements.txt - name: Install dependencies run: pip install git+https://github.com/ProgVal/Limnoria.git@testing cryptography + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies + run: |- + python -m pip install --upgrade pip + pip install pytest -r requirements.txt - name: Test with pytest - run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=~/.local/bin:$PATH make limnoria + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH make + limnoria - if: always() name: Publish results uses: actions/upload-artifact@v2 with: - name: pytest results Limnoria (devel) + name: pytest results limnoria (devel) path: pytest.xml test-solanum: + needs: + - build-solanum runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -188,40 +340,30 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - name: Cache dependencies - uses: actions/cache@v2 + - name: Download build artefacts + uses: actions/download-artifact@v2 with: - key: ${{ runner.os }}-solanum-devel - path: |- - ~/.cache - $GITHUB_WORKSPACE/solanum - - name: Install dependencies + name: installed-solanum + path: '~' + - name: Unpack artefacts + run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies run: |- - sudo apt-get install atheme-services python -m pip install --upgrade pip pip install pytest -r requirements.txt - - name: Checkout Solanum - uses: actions/checkout@v2 - with: - path: solanum - ref: main - repository: solanum-ircd/solanum - - name: Build Solanum - run: | - cd $GITHUB_WORKSPACE/solanum/ - ./autogen.sh - ./configure --prefix=$HOME/.local/ - make -j 4 - make install - name: Test with pytest - run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=~/.local/bin:$PATH make solanum + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH make + solanum - if: always() name: Publish results uses: actions/upload-artifact@v2 with: - name: pytest results Solanum (devel) + name: pytest results solanum (devel) path: pytest.xml test-sopel: + needs: [] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -229,29 +371,26 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - name: Cache dependencies - uses: actions/cache@v2 - with: - key: ${{ runner.os }}-sopel-devel - path: |- - ~/.cache - $GITHUB_WORKSPACE/placeholder - - name: Install dependencies - run: |- - sudo apt-get install atheme-services - python -m pip install --upgrade pip - pip install pytest -r requirements.txt - name: Install dependencies run: pip install git+https://github.com/sopel-irc/sopel.git + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies + run: |- + python -m pip install --upgrade pip + pip install pytest -r requirements.txt - name: Test with pytest - run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=~/.local/bin:$PATH make sopel + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH make + sopel - if: always() name: Publish results uses: actions/upload-artifact@v2 with: - name: pytest results Sopel (devel) + name: pytest results sopel (devel) path: pytest.xml test-unrealircd: + needs: + - build-unrealircd runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -259,41 +398,32 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - name: Cache dependencies - uses: actions/cache@v2 + - name: Download build artefacts + uses: actions/download-artifact@v2 with: - key: ${{ runner.os }}-unrealircd-devel - path: |- - ~/.cache - $GITHUB_WORKSPACE/unrealircd - - name: Install dependencies + name: installed-unrealircd + path: '~' + - name: Unpack artefacts + run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies run: |- - sudo apt-get install atheme-services python -m pip install --upgrade pip pip install pytest -r requirements.txt - - name: Checkout UnrealIRCd - uses: actions/checkout@v2 - with: - path: unrealircd - ref: unreal52 - repository: unrealircd/unrealircd - - name: Build UnrealIRCd - run: | - cd $GITHUB_WORKSPACE/unrealircd/ - cp $GITHUB_WORKSPACE/data/unreal/* . - CFLAGS=-O0 ./Config -quick - make -j 4 - make install - name: Test with pytest - run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=~/.local/unrealircd/bin:$PATH + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/bin:$PATH make unrealircd - if: always() name: Publish results uses: actions/upload-artifact@v2 with: - name: pytest results UnrealIRCd (devel) + name: pytest results unrealircd (devel) path: pytest.xml test-unrealircd-anope: + needs: + - build-unrealircd + - build-anope runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -301,52 +431,32 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - name: Cache dependencies - uses: actions/cache@v2 + - name: Download build artefacts + uses: actions/download-artifact@v2 with: - key: ${{ runner.os }}-unrealircd-anope-devel - path: |- - ~/.cache - $GITHUB_WORKSPACE/unrealircd - - name: Install dependencies + name: installed-unrealircd + path: '~' + - name: Download build artefacts + uses: actions/download-artifact@v2 + with: + name: installed-anope + path: '~' + - name: Unpack artefacts + run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies run: |- - sudo apt-get install atheme-services python -m pip install --upgrade pip pip install pytest -r requirements.txt - - name: Checkout UnrealIRCd - uses: actions/checkout@v2 - with: - path: unrealircd - ref: unreal52 - repository: unrealircd/unrealircd - - name: Build UnrealIRCd - run: | - cd $GITHUB_WORKSPACE/unrealircd/ - cp $GITHUB_WORKSPACE/data/unreal/* . - CFLAGS=-O0 ./Config -quick - make -j 4 - make install - - name: Checkout Anope - uses: actions/checkout@v2 - with: - path: anope - ref: 2.0.9 - repository: anope/anope - - name: Build Anope - run: |- - cd $GITHUB_WORKSPACE/anope/ - cp $GITHUB_WORKSPACE/data/anope/* . - CFLAGS=-O0 ./Config -quick - make -C build -j 4 - make -C build install - name: Test with pytest - run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=~/.local/unrealircd/bin:$PATH - make unrealircd-anope + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/bin:$PATH make + unrealircd-anope - if: always() name: Publish results uses: actions/upload-artifact@v2 with: - name: pytest results UnrealIRCd (devel) + name: pytest results anope (devel) path: pytest.xml name: irctest with devel versions 'on': diff --git a/.github/workflows/test-devel_release.yml b/.github/workflows/test-devel_release.yml index f080c59..13e5dd7 100644 --- a/.github/workflows/test-devel_release.yml +++ b/.github/workflows/test-devel_release.yml @@ -2,83 +2,12 @@ # Do not edit it manually, modifications will be lost. jobs: - publish-test-results: - if: success() || failure() - name: Publish Unit Tests Results - needs: - - test-inspircd - - test-inspircd-anope - runs-on: ubuntu-latest - steps: - - name: Download Artifacts - uses: actions/download-artifact@v2 - with: - path: artifacts - - name: Publish Unit Test Results - uses: EnricoMi/publish-unit-test-result-action@v1 - with: - files: artifacts/**/*.xml - test-inspircd: + build-anope: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up Python 3.7 - uses: actions/setup-python@v2 - with: - python-version: 3.7 - - name: Install dependencies - run: |- - sudo apt-get install atheme-services - python -m pip install --upgrade pip - pip install pytest -r requirements.txt - - name: Checkout InspIRCd - uses: actions/checkout@v2 - with: - path: inspircd - ref: insp3 - repository: inspircd/inspircd - - name: Build InspIRCd - run: | - cd $GITHUB_WORKSPACE/inspircd/ - patch src/inspircd.cpp < $GITHUB_WORKSPACE/inspircd_mainloop.patch - ./configure --prefix=$HOME/.local/inspircd --development - make -j 4 - make install - - name: Test with pytest - run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=~/.local/inspircd/bin:$PATH make - inspircd - - if: always() - name: Publish results - uses: actions/upload-artifact@v2 - with: - name: pytest results InspIRCd (devel_release) - path: pytest.xml - test-inspircd-anope: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up Python 3.7 - uses: actions/setup-python@v2 - with: - python-version: 3.7 - - name: Install dependencies - run: |- - sudo apt-get install atheme-services - python -m pip install --upgrade pip - pip install pytest -r requirements.txt - - name: Checkout InspIRCd - uses: actions/checkout@v2 - with: - path: inspircd - ref: insp3 - repository: inspircd/inspircd - - name: Build InspIRCd - run: | - cd $GITHUB_WORKSPACE/inspircd/ - patch src/inspircd.cpp < $GITHUB_WORKSPACE/inspircd_mainloop.patch - ./configure --prefix=$HOME/.local/inspircd --development - make -j 4 - make install + - name: Create directories + run: cd ~/; mkdir -p .local/ go/ - name: Checkout Anope uses: actions/checkout@v2 with: @@ -92,14 +21,343 @@ jobs: CFLAGS=-O0 ./Config -quick make -C build -j 4 make -C build install + - name: Make artefact tarball + run: cd ~; tar -czf artefacts-anope.tar.gz .local/ go/ + - name: Upload build artefacts + uses: actions/upload-artifact@v2 + with: + name: installed-anope + path: ~/artefacts-*.tar.gz + retention-days: 1 + build-inspircd: + runs-on: ubuntu-latest + steps: + - name: Create directories + run: cd ~/; mkdir -p .local/ go/ + - uses: actions/checkout@v2 + - name: Set up Python 3.7 + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - name: Checkout InspIRCd + uses: actions/checkout@v2 + with: + path: inspircd + ref: insp3 + repository: inspircd/inspircd + - name: Build InspIRCd + run: | + cd $GITHUB_WORKSPACE/inspircd/ + patch src/inspircd.cpp < $GITHUB_WORKSPACE/inspircd_mainloop.patch + ./configure --prefix=$HOME/.local/inspircd --development + make -j 4 + make install + - name: Make artefact tarball + run: cd ~; tar -czf artefacts-inspircd.tar.gz .local/ go/ + - name: Upload build artefacts + uses: actions/upload-artifact@v2 + with: + name: installed-inspircd + path: ~/artefacts-*.tar.gz + retention-days: 1 + publish-test-results: + if: success() || failure() + name: Publish Unit Tests Results + needs: + - test-charybdis + - test-solanum + - test-ergo + - test-inspircd + - test-inspircd-anope + - test-unrealircd + - test-unrealircd-anope + - test-limnoria + - test-sopel + runs-on: ubuntu-latest + steps: + - name: Download Artifacts + uses: actions/download-artifact@v2 + with: + path: artifacts + - name: Publish Unit Test Results + uses: EnricoMi/publish-unit-test-result-action@v1 + with: + files: artifacts/**/*.xml + test-charybdis: + needs: + - build-charybdis + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3.7 + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - name: Download build artefacts + uses: actions/download-artifact@v2 + with: + name: installed-charybdis + path: '~' + - name: Unpack artefacts + run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies + run: |- + python -m pip install --upgrade pip + pip install pytest -r requirements.txt - name: Test with pytest - run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=~/.local/inspircd/bin:$PATH make + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH make + charybdis + - if: always() + name: Publish results + uses: actions/upload-artifact@v2 + with: + name: pytest results charybdis (devel_release) + path: pytest.xml + test-ergo: + needs: [] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3.7 + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies + run: |- + python -m pip install --upgrade pip + pip install pytest -r requirements.txt + - name: Test with pytest + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/go/bin:$PATH + make ergo + - if: always() + name: Publish results + uses: actions/upload-artifact@v2 + with: + name: pytest results ergo (devel_release) + path: pytest.xml + test-inspircd: + needs: + - build-inspircd + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3.7 + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - name: Download build artefacts + uses: actions/download-artifact@v2 + with: + name: installed-inspircd + path: '~' + - name: Unpack artefacts + run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies + run: |- + python -m pip install --upgrade pip + pip install pytest -r requirements.txt + - name: Test with pytest + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/bin:$PATH + make inspircd + - if: always() + name: Publish results + uses: actions/upload-artifact@v2 + with: + name: pytest results inspircd (devel_release) + path: pytest.xml + test-inspircd-anope: + needs: + - build-inspircd + - build-anope + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3.7 + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - name: Download build artefacts + uses: actions/download-artifact@v2 + with: + name: installed-inspircd + path: '~' + - name: Download build artefacts + uses: actions/download-artifact@v2 + with: + name: installed-anope + path: '~' + - name: Unpack artefacts + run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies + run: |- + python -m pip install --upgrade pip + pip install pytest -r requirements.txt + - name: Test with pytest + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/bin:$PATH make inspircd-anope - if: always() name: Publish results uses: actions/upload-artifact@v2 with: - name: pytest results InspIRCd (devel_release) + name: pytest results anope (devel_release) + path: pytest.xml + test-limnoria: + needs: [] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3.7 + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies + run: |- + python -m pip install --upgrade pip + pip install pytest -r requirements.txt + - name: Test with pytest + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH make + limnoria + - if: always() + name: Publish results + uses: actions/upload-artifact@v2 + with: + name: pytest results limnoria (devel_release) + path: pytest.xml + test-solanum: + needs: + - build-solanum + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3.7 + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - name: Download build artefacts + uses: actions/download-artifact@v2 + with: + name: installed-solanum + path: '~' + - name: Unpack artefacts + run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies + run: |- + python -m pip install --upgrade pip + pip install pytest -r requirements.txt + - name: Test with pytest + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH make + solanum + - if: always() + name: Publish results + uses: actions/upload-artifact@v2 + with: + name: pytest results solanum (devel_release) + path: pytest.xml + test-sopel: + needs: [] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3.7 + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies + run: |- + python -m pip install --upgrade pip + pip install pytest -r requirements.txt + - name: Test with pytest + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH make + sopel + - if: always() + name: Publish results + uses: actions/upload-artifact@v2 + with: + name: pytest results sopel (devel_release) + path: pytest.xml + test-unrealircd: + needs: + - build-unrealircd + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3.7 + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - name: Download build artefacts + uses: actions/download-artifact@v2 + with: + name: installed-unrealircd + path: '~' + - name: Unpack artefacts + run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies + run: |- + python -m pip install --upgrade pip + pip install pytest -r requirements.txt + - name: Test with pytest + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/bin:$PATH + make unrealircd + - if: always() + name: Publish results + uses: actions/upload-artifact@v2 + with: + name: pytest results unrealircd (devel_release) + path: pytest.xml + test-unrealircd-anope: + needs: + - build-unrealircd + - build-anope + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3.7 + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - name: Download build artefacts + uses: actions/download-artifact@v2 + with: + name: installed-unrealircd + path: '~' + - name: Download build artefacts + uses: actions/download-artifact@v2 + with: + name: installed-anope + path: '~' + - name: Unpack artefacts + run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies + run: |- + python -m pip install --upgrade pip + pip install pytest -r requirements.txt + - name: Test with pytest + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/bin:$PATH make + unrealircd-anope + - if: always() + name: Publish results + uses: actions/upload-artifact@v2 + with: + name: pytest results anope (devel_release) path: pytest.xml name: irctest with devel_release versions 'on': diff --git a/.github/workflows/test-stable.yml b/.github/workflows/test-stable.yml index a9adb6f..d576960 100644 --- a/.github/workflows/test-stable.yml +++ b/.github/workflows/test-stable.yml @@ -2,6 +2,182 @@ # Do not edit it manually, modifications will be lost. jobs: + build-anope: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Create directories + run: cd ~/; mkdir -p .local/ go/ + - name: Checkout Anope + uses: actions/checkout@v2 + with: + path: anope + ref: 2.0.9 + repository: anope/anope + - name: Build Anope + run: |- + cd $GITHUB_WORKSPACE/anope/ + cp $GITHUB_WORKSPACE/data/anope/* . + CFLAGS=-O0 ./Config -quick + make -C build -j 4 + make -C build install + - name: Make artefact tarball + run: cd ~; tar -czf artefacts-anope.tar.gz .local/ go/ + - name: Upload build artefacts + uses: actions/upload-artifact@v2 + with: + name: installed-anope + path: ~/artefacts-*.tar.gz + retention-days: 1 + build-charybdis: + runs-on: ubuntu-latest + steps: + - name: Create directories + run: cd ~/; mkdir -p .local/ go/ + - name: Cache dependencies + uses: actions/cache@v2 + with: + key: ${{ runner.os }}-charybdis-stable + path: |- + ~/.cache + $GITHUB_WORKSPACE/charybdis + - uses: actions/checkout@v2 + - name: Set up Python 3.7 + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - name: Checkout Charybdis + uses: actions/checkout@v2 + with: + path: charybdis + ref: charybdis-4.1.2 + repository: charybdis-ircd/charybdis + - name: Build Charybdis + run: | + cd $GITHUB_WORKSPACE/charybdis/ + ./autogen.sh + ./configure --prefix=$HOME/.local/ + make -j 4 + make install + - name: Make artefact tarball + run: cd ~; tar -czf artefacts-charybdis.tar.gz .local/ go/ + - name: Upload build artefacts + uses: actions/upload-artifact@v2 + with: + name: installed-charybdis + path: ~/artefacts-*.tar.gz + retention-days: 1 + build-inspircd: + runs-on: ubuntu-latest + steps: + - name: Create directories + run: cd ~/; mkdir -p .local/ go/ + - uses: actions/checkout@v2 + - name: Set up Python 3.7 + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - name: Checkout InspIRCd + uses: actions/checkout@v2 + with: + path: inspircd + ref: v3.10.0 + repository: inspircd/inspircd + - name: Build InspIRCd + run: | + cd $GITHUB_WORKSPACE/inspircd/ + patch src/inspircd.cpp < $GITHUB_WORKSPACE/inspircd_mainloop.patch + ./configure --prefix=$HOME/.local/inspircd --development + make -j 4 + make install + - name: Make artefact tarball + run: cd ~; tar -czf artefacts-inspircd.tar.gz .local/ go/ + - name: Upload build artefacts + uses: actions/upload-artifact@v2 + with: + name: installed-inspircd + path: ~/artefacts-*.tar.gz + retention-days: 1 + build-solanum: + runs-on: ubuntu-latest + steps: + - name: Create directories + run: cd ~/; mkdir -p .local/ go/ + - name: Cache dependencies + uses: actions/cache@v2 + with: + key: ${{ runner.os }}-solanum-stable + path: |- + ~/.cache + $GITHUB_WORKSPACE/solanum + - uses: actions/checkout@v2 + - name: Set up Python 3.7 + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - name: Checkout Solanum + uses: actions/checkout@v2 + with: + path: solanum + ref: e370888264da666a1bd9faac86cd5f2aa06084f4 + repository: solanum-ircd/solanum + - name: Build Solanum + run: | + cd $GITHUB_WORKSPACE/solanum/ + ./autogen.sh + ./configure --prefix=$HOME/.local/ + make -j 4 + make install + - name: Make artefact tarball + run: cd ~; tar -czf artefacts-solanum.tar.gz .local/ go/ + - name: Upload build artefacts + uses: actions/upload-artifact@v2 + with: + name: installed-solanum + path: ~/artefacts-*.tar.gz + retention-days: 1 + build-unrealircd: + runs-on: ubuntu-latest + steps: + - name: Create directories + run: cd ~/; mkdir -p .local/ go/ + - name: Cache dependencies + uses: actions/cache@v2 + with: + key: ${{ runner.os }}-unrealircd-stable + path: |- + ~/.cache + $GITHUB_WORKSPACE/unrealircd + - uses: actions/checkout@v2 + - name: Set up Python 3.7 + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - name: Checkout UnrealIRCd + uses: actions/checkout@v2 + with: + path: unrealircd + ref: 94993a03ca8d3c193c0295c33af39270c3f9d27d + repository: unrealircd/unrealircd + - name: Build UnrealIRCd + run: | + cd $GITHUB_WORKSPACE/unrealircd/ + cp $GITHUB_WORKSPACE/data/unreal/* . + # Need to use a specific -march, because GitHub has inconsistent + # architectures across workers, which result in random SIGILL with some + # worker combinations + sudo apt install libsodium-dev libargon2-dev + CFLAGS="-O0 -march=x86-64" CXXFLAGS="$CFLAGS" ./Config -quick + make -j 4 + make install + - name: Make artefact tarball + run: cd ~; tar -czf artefacts-unrealircd.tar.gz .local/ go/ + - name: Upload build artefacts + uses: actions/upload-artifact@v2 + with: + name: installed-unrealircd + path: ~/artefacts-*.tar.gz + retention-days: 1 publish-test-results: if: success() || failure() name: Publish Unit Tests Results @@ -26,6 +202,8 @@ jobs: with: files: artifacts/**/*.xml test-charybdis: + needs: + - build-charybdis runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -33,40 +211,30 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - name: Cache dependencies - uses: actions/cache@v2 + - name: Download build artefacts + uses: actions/download-artifact@v2 with: - key: ${{ runner.os }}-charybdis-stable - path: |- - ~/.cache - $GITHUB_WORKSPACE/charybdis - - name: Install dependencies + name: installed-charybdis + path: '~' + - name: Unpack artefacts + run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies run: |- - sudo apt-get install atheme-services python -m pip install --upgrade pip pip install pytest -r requirements.txt - - name: Checkout Charybdis - uses: actions/checkout@v2 - with: - path: charybdis - ref: charybdis-4.1.2 - repository: charybdis-ircd/charybdis - - name: Build Charybdis - run: | - cd $GITHUB_WORKSPACE/charybdis/ - ./autogen.sh - ./configure --prefix=$HOME/.local/ - make -j 4 - make install - name: Test with pytest - run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=~/.local/bin:$PATH make charybdis + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH make + charybdis - if: always() name: Publish results uses: actions/upload-artifact@v2 with: - name: pytest results Charybdis (stable) + name: pytest results charybdis (stable) path: pytest.xml test-ergo: + needs: [] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -74,42 +242,39 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - uses: actions/setup-go@v2 - with: - go-version: ~1.16 - - run: go version - - name: Cache dependencies - uses: actions/cache@v2 - with: - key: ${{ runner.os }}-ergo-stable - path: |- - ~/.cache - $GITHUB_WORKSPACE/ergo - - name: Install dependencies - run: |- - sudo apt-get install atheme-services - python -m pip install --upgrade pip - pip install pytest -r requirements.txt - name: Checkout Ergo uses: actions/checkout@v2 with: path: ergo ref: irctest_stable repository: ergochat/ergo + - uses: actions/setup-go@v2 + with: + go-version: ~1.16 + - run: go version - name: Build Ergo run: | cd $GITHUB_WORKSPACE/ergo/ make build make install + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies + run: |- + python -m pip install --upgrade pip + pip install pytest -r requirements.txt - name: Test with pytest - run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=~/go/bin:$PATH make ergo + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/go/bin:$PATH + make ergo - if: always() name: Publish results uses: actions/upload-artifact@v2 with: - name: pytest results Ergo (stable) + name: pytest results ergo (stable) path: pytest.xml test-inspircd: + needs: + - build-inspircd runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -117,34 +282,32 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - name: Install dependencies + - name: Download build artefacts + uses: actions/download-artifact@v2 + with: + name: installed-inspircd + path: '~' + - name: Unpack artefacts + run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies run: |- - sudo apt-get install atheme-services python -m pip install --upgrade pip pip install pytest -r requirements.txt - - name: Checkout InspIRCd - uses: actions/checkout@v2 - with: - path: inspircd - ref: v3.10.0 - repository: inspircd/inspircd - - name: Build InspIRCd - run: | - cd $GITHUB_WORKSPACE/inspircd/ - patch src/inspircd.cpp < $GITHUB_WORKSPACE/inspircd_mainloop.patch - ./configure --prefix=$HOME/.local/inspircd --development - make -j 4 - make install - name: Test with pytest - run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=~/.local/inspircd/bin:$PATH make - inspircd + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/bin:$PATH + make inspircd - if: always() name: Publish results uses: actions/upload-artifact@v2 with: - name: pytest results InspIRCd (stable) + name: pytest results inspircd (stable) path: pytest.xml test-inspircd-anope: + needs: + - build-inspircd + - build-anope runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -152,47 +315,35 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - name: Install dependencies + - name: Download build artefacts + uses: actions/download-artifact@v2 + with: + name: installed-inspircd + path: '~' + - name: Download build artefacts + uses: actions/download-artifact@v2 + with: + name: installed-anope + path: '~' + - name: Unpack artefacts + run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies run: |- - sudo apt-get install atheme-services python -m pip install --upgrade pip pip install pytest -r requirements.txt - - name: Checkout InspIRCd - uses: actions/checkout@v2 - with: - path: inspircd - ref: v3.10.0 - repository: inspircd/inspircd - - name: Build InspIRCd - run: | - cd $GITHUB_WORKSPACE/inspircd/ - patch src/inspircd.cpp < $GITHUB_WORKSPACE/inspircd_mainloop.patch - ./configure --prefix=$HOME/.local/inspircd --development - make -j 4 - make install - - name: Checkout Anope - uses: actions/checkout@v2 - with: - path: anope - ref: 2.0.9 - repository: anope/anope - - name: Build Anope - run: |- - cd $GITHUB_WORKSPACE/anope/ - cp $GITHUB_WORKSPACE/data/anope/* . - CFLAGS=-O0 ./Config -quick - make -C build -j 4 - make -C build install - name: Test with pytest - run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=~/.local/inspircd/bin:$PATH make + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/inspircd/bin:$PATH make inspircd-anope - if: always() name: Publish results uses: actions/upload-artifact@v2 with: - name: pytest results InspIRCd (stable) + name: pytest results anope (stable) path: pytest.xml test-limnoria: + needs: [] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -200,29 +351,26 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - name: Cache dependencies - uses: actions/cache@v2 - with: - key: ${{ runner.os }}-limnoria-stable - path: |- - ~/.cache - $GITHUB_WORKSPACE/placeholder - - name: Install dependencies - run: |- - sudo apt-get install atheme-services - python -m pip install --upgrade pip - pip install pytest -r requirements.txt - name: Install dependencies run: pip install limnoria==2021.06.15 cryptography + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies + run: |- + python -m pip install --upgrade pip + pip install pytest -r requirements.txt - name: Test with pytest - run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=~/.local/bin:$PATH make limnoria + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH make + limnoria - if: always() name: Publish results uses: actions/upload-artifact@v2 with: - name: pytest results Limnoria (stable) + name: pytest results limnoria (stable) path: pytest.xml test-solanum: + needs: + - build-solanum runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -230,40 +378,30 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - name: Cache dependencies - uses: actions/cache@v2 + - name: Download build artefacts + uses: actions/download-artifact@v2 with: - key: ${{ runner.os }}-solanum-stable - path: |- - ~/.cache - $GITHUB_WORKSPACE/solanum - - name: Install dependencies + name: installed-solanum + path: '~' + - name: Unpack artefacts + run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies run: |- - sudo apt-get install atheme-services python -m pip install --upgrade pip pip install pytest -r requirements.txt - - name: Checkout Solanum - uses: actions/checkout@v2 - with: - path: solanum - ref: e370888264da666a1bd9faac86cd5f2aa06084f4 - repository: solanum-ircd/solanum - - name: Build Solanum - run: | - cd $GITHUB_WORKSPACE/solanum/ - ./autogen.sh - ./configure --prefix=$HOME/.local/ - make -j 4 - make install - name: Test with pytest - run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=~/.local/bin:$PATH make solanum + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH make + solanum - if: always() name: Publish results uses: actions/upload-artifact@v2 with: - name: pytest results Solanum (stable) + name: pytest results solanum (stable) path: pytest.xml test-sopel: + needs: [] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -271,29 +409,26 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - name: Cache dependencies - uses: actions/cache@v2 - with: - key: ${{ runner.os }}-sopel-stable - path: |- - ~/.cache - $GITHUB_WORKSPACE/placeholder - - name: Install dependencies - run: |- - sudo apt-get install atheme-services - python -m pip install --upgrade pip - pip install pytest -r requirements.txt - name: Install dependencies run: pip install sopel==7.1.1 + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies + run: |- + python -m pip install --upgrade pip + pip install pytest -r requirements.txt - name: Test with pytest - run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=~/.local/bin:$PATH make sopel + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH make + sopel - if: always() name: Publish results uses: actions/upload-artifact@v2 with: - name: pytest results Sopel (stable) + name: pytest results sopel (stable) path: pytest.xml test-unrealircd: + needs: + - build-unrealircd runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -301,41 +436,32 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - name: Cache dependencies - uses: actions/cache@v2 + - name: Download build artefacts + uses: actions/download-artifact@v2 with: - key: ${{ runner.os }}-unrealircd-stable - path: |- - ~/.cache - $GITHUB_WORKSPACE/unrealircd - - name: Install dependencies + name: installed-unrealircd + path: '~' + - name: Unpack artefacts + run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies run: |- - sudo apt-get install atheme-services python -m pip install --upgrade pip pip install pytest -r requirements.txt - - name: Checkout UnrealIRCd - uses: actions/checkout@v2 - with: - path: unrealircd - ref: 94993a03ca8d3c193c0295c33af39270c3f9d27d - repository: unrealircd/unrealircd - - name: Build UnrealIRCd - run: | - cd $GITHUB_WORKSPACE/unrealircd/ - cp $GITHUB_WORKSPACE/data/unreal/* . - CFLAGS=-O0 ./Config -quick - make -j 4 - make install - name: Test with pytest - run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=~/.local/unrealircd/bin:$PATH + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/bin:$PATH make unrealircd - if: always() name: Publish results uses: actions/upload-artifact@v2 with: - name: pytest results UnrealIRCd (stable) + name: pytest results unrealircd (stable) path: pytest.xml test-unrealircd-anope: + needs: + - build-unrealircd + - build-anope runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -343,52 +469,32 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - name: Cache dependencies - uses: actions/cache@v2 + - name: Download build artefacts + uses: actions/download-artifact@v2 with: - key: ${{ runner.os }}-unrealircd-anope-stable - path: |- - ~/.cache - $GITHUB_WORKSPACE/unrealircd - - name: Install dependencies + name: installed-unrealircd + path: '~' + - name: Download build artefacts + uses: actions/download-artifact@v2 + with: + name: installed-anope + path: '~' + - name: Unpack artefacts + run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \; + - name: Install Atheme + run: sudo apt-get install atheme-services + - name: Install irctest dependencies run: |- - sudo apt-get install atheme-services python -m pip install --upgrade pip pip install pytest -r requirements.txt - - name: Checkout UnrealIRCd - uses: actions/checkout@v2 - with: - path: unrealircd - ref: 94993a03ca8d3c193c0295c33af39270c3f9d27d - repository: unrealircd/unrealircd - - name: Build UnrealIRCd - run: | - cd $GITHUB_WORKSPACE/unrealircd/ - cp $GITHUB_WORKSPACE/data/unreal/* . - CFLAGS=-O0 ./Config -quick - make -j 4 - make install - - name: Checkout Anope - uses: actions/checkout@v2 - with: - path: anope - ref: 2.0.9 - repository: anope/anope - - name: Build Anope - run: |- - cd $GITHUB_WORKSPACE/anope/ - cp $GITHUB_WORKSPACE/data/anope/* . - CFLAGS=-O0 ./Config -quick - make -C build -j 4 - make -C build install - name: Test with pytest - run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=~/.local/unrealircd/bin:$PATH - make unrealircd-anope + run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PATH=~/.local/unrealircd/bin:$PATH make + unrealircd-anope - if: always() name: Publish results uses: actions/upload-artifact@v2 with: - name: pytest results UnrealIRCd (stable) + name: pytest results anope (stable) path: pytest.xml name: irctest with stable versions 'on': diff --git a/irctest/controllers/unrealircd.py b/irctest/controllers/unrealircd.py index 1abc400..9d02d14 100644 --- a/irctest/controllers/unrealircd.py +++ b/irctest/controllers/unrealircd.py @@ -169,11 +169,12 @@ class UnrealircdController(BaseServerController, DirectoryBasedController): self.proc = subprocess.Popen( [ "unrealircd", + "-t", "-F", # BOOT_NOFORK "-f", os.path.join(self.directory, "unrealircd.conf"), ], - stdout=subprocess.DEVNULL, + # stdout=subprocess.DEVNULL, ) if run_services: diff --git a/make_workflows.py b/make_workflows.py index be59173..5711cc6 100644 --- a/make_workflows.py +++ b/make_workflows.py @@ -50,10 +50,8 @@ class VersionFlavor(enum.Enum): release series, it uses that branch instead""" -def get_build_job(*, software_config, software_id, version_flavor): +def get_install_steps(*, software_config, software_id, version_flavor): name = software_config["name"] - prefix = software_config.get("prefix", "~/.local") - if "install_steps" in software_config: path = "placeholder" # TODO: remove this install_steps = software_config["install_steps"][version_flavor.value] @@ -74,40 +72,23 @@ def get_build_job(*, software_config, software_id, version_flavor): "path": path, }, }, + *software_config.get("pre_deps", []), { "name": f"Build {name}", "run": script(software_config["build_script"]), }, ] - if software_config.get("build_anope", False): - install_steps.append( - { - "name": "Checkout Anope", - "uses": "actions/checkout@v2", - "with": { - "repository": "anope/anope", - "ref": "2.0.9", - "path": "anope", - }, - } - ) - install_steps.append( - { - "name": "Build Anope", - "run": script( - "cd $GITHUB_WORKSPACE/anope/", - "cp $GITHUB_WORKSPACE/data/anope/* .", - "CFLAGS=-O0 ./Config -quick", - "make -C build -j 4", - "make -C build install", - ), - } - ) + return install_steps - env = software_config.get("env", {}).get(version_flavor.value, "") - if env: - env += " " + +def get_build_job(*, software_config, software_id, version_flavor): + if not software_config["separate_build_job"]: + return None + if "install_steps" in software_config: + path = "placeholder" # TODO: remove this + else: + path = software_config["path"] if software_config.get("cache", True): cache = [ @@ -126,21 +107,100 @@ def get_build_job(*, software_config, software_id, version_flavor): else: cache = [] + install_steps = get_install_steps( + software_config=software_config, + software_id=software_id, + version_flavor=version_flavor, + ) + if install_steps is None: + return None + return { "runs-on": "ubuntu-latest", "steps": [ + { + "name": "Create directories", + "run": "cd ~/; mkdir -p .local/ go/", + }, + *cache, {"uses": "actions/checkout@v2"}, { - "name": "Set up Python 3.7", # for irctest itself + "name": "Set up Python 3.7", "uses": "actions/setup-python@v2", "with": {"python-version": 3.7}, }, - *software_config.get("pre_deps", []), - *cache, + *install_steps, + *upload_steps(software_id), + ], + } + + +def get_test_job(*, config, test_config, test_id, version_flavor): + env = "" + needs = [] + downloads = [] + install_steps = [] + for software_id in test_config.get("software", []): + if software_id == "anope": + # TODO: don't hardcode anope here + software_config = {"separate_build_job": True} + else: + software_config = config["software"][software_id] + + env += software_config.get("env", {}).get(version_flavor.value, "") + " " + if "prefix" in software_config: + env += f"PATH={software_config['prefix']}/bin:$PATH " + + if software_config["separate_build_job"]: + needs.append(f"build-{software_id}") + downloads.append( + { + "name": "Download build artefacts", + "uses": "actions/download-artifact@v2", + "with": {"name": f"installed-{software_id}", "path": "~"}, + } + ) + else: + install_steps.extend( + get_install_steps( + software_config=software_config, + software_id=software_id, + version_flavor=version_flavor, + ) + or [] + ) + + if downloads: + unpack = [ { - "name": "Install dependencies", + "name": "Unpack artefacts", + "run": r"cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;", + }, + ] + else: + # All the software is built in the same job, nothing to unpack + unpack = [] + + return { + "runs-on": "ubuntu-latest", + "needs": needs, + "steps": [ + {"uses": "actions/checkout@v2"}, + { + "name": "Set up Python 3.7", + "uses": "actions/setup-python@v2", + "with": {"python-version": 3.7}, + }, + *downloads, + *unpack, + *install_steps, + { + "name": "Install Atheme", + "run": "sudo apt-get install atheme-services", + }, + { + "name": "Install irctest dependencies", "run": script( - "sudo apt-get install atheme-services", "python -m pip install --upgrade pip", "pip install pytest -r requirements.txt", *( @@ -150,13 +210,12 @@ def get_build_job(*, software_config, software_id, version_flavor): ), ), }, - *install_steps, { "name": "Test with pytest", "run": ( f"PYTEST_ARGS='--junit-xml pytest.xml' " - f"PATH={prefix}/bin:$PATH " - f"{env}make {software_id}" + f"PATH=$HOME/.local/bin:$PATH " + f"{env}make {test_id}" ), }, { @@ -164,7 +223,7 @@ def get_build_job(*, software_config, software_id, version_flavor): "if": "always()", "uses": "actions/upload-artifact@v2", "with": { - "name": f"pytest results {name} ({version_flavor.value})", + "name": f"pytest results {software_id} ({version_flavor.value})", "path": "pytest.xml", }, }, @@ -172,6 +231,60 @@ def get_build_job(*, software_config, software_id, version_flavor): } +def get_build_job_anope(): + return { + "runs-on": "ubuntu-latest", + "steps": [ + {"uses": "actions/checkout@v2"}, + { + "name": "Create directories", + "run": "cd ~/; mkdir -p .local/ go/", + }, + { + "name": "Checkout Anope", + "uses": "actions/checkout@v2", + "with": { + "repository": "anope/anope", + "ref": "2.0.9", + "path": "anope", + }, + }, + { + "name": "Build Anope", + "run": script( + "cd $GITHUB_WORKSPACE/anope/", + "cp $GITHUB_WORKSPACE/data/anope/* .", + "CFLAGS=-O0 ./Config -quick", + "make -C build -j 4", + "make -C build install", + ), + }, + *upload_steps("anope"), + ], + } + + +def upload_steps(software_id): + """Make a tarball (to preserve permissions) and upload""" + return [ + { + "name": "Make artefact tarball", + "run": f"cd ~; tar -czf artefacts-{software_id}.tar.gz .local/ go/", + }, + { + "name": "Upload build artefacts", + "uses": "actions/upload-artifact@v2", + "with": { + "name": f"installed-{software_id}", + "path": "~/artefacts-*.tar.gz", + # We only need it for the next step of the workflow, so let's + # just delete it ASAP to avoid wasting resources + "retention-days": 1, + }, + }, + ] + + def generate_workflow(config: dict, version_flavor: VersionFlavor): on: dict @@ -191,19 +304,32 @@ def generate_workflow(config: dict, version_flavor: VersionFlavor): } jobs = {} + for software_id in config["software"]: software_config = config["software"][software_id] - job = get_build_job( + build_job = get_build_job( software_config=software_config, software_id=software_id, version_flavor=version_flavor, ) - if job is not None: - jobs[f"test-{software_id}"] = job + if build_job is not None: + jobs[f"build-{software_id}"] = build_job + for test_id in config["tests"]: + test_config = config["tests"][test_id] + test_job = get_test_job( + config=config, + test_config=test_config, + test_id=test_id, + version_flavor=version_flavor, + ) + if test_job is not None: + jobs[f"test-{test_id}"] = test_job + + jobs["build-anope"] = get_build_job_anope() jobs["publish-test-results"] = { "name": "Publish Unit Tests Results", - "needs": list(jobs), # Depend on all other jobs + "needs": [f"test-{test_id}" for test_id in config["tests"]], "runs-on": "ubuntu-latest", # the build-and-test job might be skipped, we don't need to run # this job then diff --git a/workflows.yml b/workflows.yml index b507187..bb4c668 100644 --- a/workflows.yml +++ b/workflows.yml @@ -15,6 +15,7 @@ software: devel: null devel_release: null path: charybdis + separate_build_job: true build_script: | cd $GITHUB_WORKSPACE/charybdis/ ./autogen.sh @@ -33,6 +34,7 @@ software: devel: main devel_release: null path: solanum + separate_build_job: true build_script: | cd $GITHUB_WORKSPACE/solanum/ ./autogen.sh @@ -57,6 +59,7 @@ software: with: go-version: '~1.16' - run: go version + separate_build_job: false build_script: | cd $GITHUB_WORKSPACE/ergo/ make build @@ -76,6 +79,7 @@ software: path: inspircd prefix: ~/.local/inspircd cache: false # incremental compilation is frequently broken + separate_build_job: true build_script: &inspircd_build_script | cd $GITHUB_WORKSPACE/inspircd/ patch src/inspircd.cpp < $GITHUB_WORKSPACE/inspircd_mainloop.patch @@ -83,16 +87,6 @@ software: make -j 4 make install - inspircd-anope: - name: InspIRCd - repository: inspircd/inspircd - refs: *inspircd_refs - path: inspircd - prefix: ~/.local/inspircd - cache: false # incremental compilation is frequently broken - build_anope: true - build_script: *inspircd_build_script - unrealircd: name: UnrealIRCd repository: unrealircd/unrealircd @@ -103,27 +97,24 @@ software: devel_release: null path: unrealircd prefix: ~/.local/unrealircd + separate_build_job: true build_script: &unrealircd_build_script | cd $GITHUB_WORKSPACE/unrealircd/ cp $GITHUB_WORKSPACE/data/unreal/* . - CFLAGS=-O0 ./Config -quick + # Need to use a specific -march, because GitHub has inconsistent + # architectures across workers, which result in random SIGILL with some + # worker combinations + sudo apt install libsodium-dev libargon2-dev + CFLAGS="-O0 -march=x86-64" CXXFLAGS="$CFLAGS" ./Config -quick make -j 4 make install - unrealircd-anope: - name: UnrealIRCd - repository: unrealircd/unrealircd - refs: *unrealircd_refs - path: unrealircd - prefix: ~/.local/unrealircd - build_anope: true - build_script: *unrealircd_build_script - ############################# # Clients: limnoria: name: Limnoria + separate_build_job: false install_steps: stable: - name: Install dependencies @@ -138,6 +129,7 @@ software: sopel: name: Sopel + separate_build_job: false install_steps: stable: - name: Install dependencies @@ -149,3 +141,31 @@ software: - name: Install dependencies run: pip install git+https://github.com/sopel-irc/sopel.git devel_release: null + +tests: + charybdis: + software: [charybdis] + + solanum: + software: [solanum] + + ergo: + software: [ergo] + + inspircd: + software: [inspircd] + + inspircd-anope: + software: [inspircd, anope] + + unrealircd: + software: [unrealircd] + + unrealircd-anope: + software: [unrealircd, anope] + + limnoria: + software: [limnoria] + + sopel: + software: [sopel]