From 2c5c9a198c7d9c330eeb34ead0b27defc4a28dc6 Mon Sep 17 00:00:00 2001 From: ben Date: Tue, 20 May 2025 17:45:26 +0200 Subject: [PATCH] ci: update branches and paths --- .github/workflows/benchmark.yml | 2 +- .github/workflows/micromamba.yml | 74 +--------------------- .github/workflows/miniconda_miniforge.yml | 75 +---------------------- 3 files changed, 5 insertions(+), 146 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index e20fd9c..07882b7 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -75,7 +75,7 @@ jobs: uses: actions/cache@v3 with: path: out/ - key: benchmark-${{ runner.os }}-${{ hashFiles('Clustering.yaml') }} + key: benchmark-${{ runner.os }}-${{ hashFiles('Clustering_conda_short.yaml') }} - name: Prepare output run: | diff --git a/.github/workflows/micromamba.yml b/.github/workflows/micromamba.yml index de80618..47a3340 100644 --- a/.github/workflows/micromamba.yml +++ b/.github/workflows/micromamba.yml @@ -7,21 +7,15 @@ on: pull_request: workflow_dispatch: schedule: - # - cron: "*/30 * * * *" # Runs every 30 minutes for testing - cron: "30 1 * * *" # at 1.30am -## these permissions are only for deployment to gh pages -# permissions: -# id-token: write -# pages: write jobs: run-benchmark-micromamba: name: run_clustbench_micromamba - ## runs-on: ubuntu-latest runs-on: self-hosted strategy: matrix: - ob_branch: [dev, reduce_install_scope, main] + ob_branch: [main] micromamba-version: ['2.1.1-0', '2.0.5-0', '1.5.12-0', '1.5.8-0'] fail-fast: false concurrency: @@ -50,81 +44,17 @@ jobs: micromamba --version pip install git+https://github.com/omnibenchmark/omnibenchmark.git@${{ matrix.ob_branch }} - # - name: Enable a benchmarking `out` cache - # id: cache-benchmark - # uses: actions/cache@v3 - # with: - # path: out/ - # key: benchmark-${{ runner.os }}-${{ hashFiles('Clustering.yaml') }} - - name: Run benchmark shell: bash -l {0} run: | env - output=$( echo "y" | ob run benchmark -b Clustering.yaml --local --cores 10 2>&1 ) + output=$( ob run benchmark -b Clustering_conda_short.yaml --local --cores 10 2>&1 ) status=$? if echo "$output" | grep -i 'Benchmark run has finished successfully'; then status=0 fi echo -e $output sh -c "exit $status" - if: matrix.ob_branch == 'dev' || matrix.ob_branch == 'reduce_install_scope' - - - name: Run benchmark - shell: bash -l {0} - run: | - env - output=$( ob run benchmark -b Clustering.yaml --local --threads 10 2>&1 ) - status=$? - if echo "$output" | grep -i 'Benchmark run has finished successfully'; then - status=0 - fi - echo -e $output - sh -c "exit $status" if: matrix.ob_branch == 'main' - # upload-artifact: - # name: Benchmark Artifact - # runs-on: ubuntu-latest - # ## runs-on: self-hosted - # needs: run-benchmark - # if: always() - # steps: - # - name: Check out repository - # uses: actions/checkout@v4 - - # - name: Load cached output - # uses: actions/cache@v3 - # with: - # path: out/ - # key: benchmark-${{ runner.os }}-${{ hashFiles('Clustering.yaml') }} - - # - name: Prepare output - # run: | - # zip -r benchmark_output.zip out/ - # mkdir -p gh-pages - # cp out/plotting/plotting_report.html gh-pages/index.html - - # - name: Upload zipped output - # uses: actions/upload-artifact@v4 - # with: - # name: benchmark-output - # path: benchmark_output.zip - # retention-days: 7 - - # - name: Upload Pages Artifact - # uses: actions/upload-pages-artifact@v3 - # with: - # path: gh-pages - - # - name: Deploy to GitHub Pages - # uses: actions/deploy-pages@v4 - - # - name: Create Job Summary - # if: always() - # run: | - # echo "### Reports" >> $GITHUB_STEP_SUMMARY - # echo "- [Plotting Report](https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }})" >> $GITHUB_STEP_SUMMARY - # echo "### All Outputs" >> $GITHUB_STEP_SUMMARY - # echo "- [Complete Benchmark Output](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}#artifacts)" >> $GITHUB_STEP_SUMMARY diff --git a/.github/workflows/miniconda_miniforge.yml b/.github/workflows/miniconda_miniforge.yml index 4d20c5c..99f76c0 100644 --- a/.github/workflows/miniconda_miniforge.yml +++ b/.github/workflows/miniconda_miniforge.yml @@ -7,13 +7,8 @@ on: pull_request: workflow_dispatch: schedule: - # - cron: "*/30 * * * *" # Runs every 30 minutes for testing - cron: "30 1 * * *" # at 1.30am -## these permissions are only for deployment to gh pages -# permissions: -# id-token: write -# pages: write jobs: run-benchmark-miniforge: @@ -22,7 +17,7 @@ jobs: runs-on: self-hosted strategy: matrix: - ob_branch: [dev, reduce_install_scope, main] + ob_branch: [main] fail-fast: false concurrency: group: mambaforge-${{ matrix.ob_branch }} @@ -59,31 +54,11 @@ jobs: mamba install -y pip pip install git+https://github.com/omnibenchmark/omnibenchmark.git@${{ matrix.ob_branch }} - # - name: Enable a benchmarking `out` cache - # id: cache-benchmark - # uses: actions/cache@v3 - # with: - # path: out/ - # key: benchmark-${{ runner.os }}-${{ hashFiles('Clustering.yaml') }} - - name: Run benchmark shell: bash -l {0} run: | env - output=$( echo "y" | ob run benchmark -b Clustering.yaml --local --cores 10 2>&1 ) - status=$? - if echo "$output" | grep -i 'Benchmark run has finished successfully'; then - status=0 - fi - echo -e $output - sh -c "exit $status" - if: matrix.ob_branch == 'dev' || matrix.ob_branch == 'reduce_install_scope' - - - name: Run benchmark - shell: bash -l {0} - run: | - env - output=$( ob run benchmark -b Clustering.yaml --local --threads 10 2>&1 ) + output=$( ob run benchmark -b Clustering_conda_short.yaml --local --cores 10 2>&1 ) status=$? if echo "$output" | grep -i 'Benchmark run has finished successfully'; then status=0 @@ -91,49 +66,3 @@ jobs: echo -e $output sh -c "exit $status" if: matrix.ob_branch == 'main' - - # upload-artifact: - # name: Benchmark Artifact - # runs-on: ubuntu-latest - # ## runs-on: self-hosted - # needs: run-benchmark - # if: always() - # steps: - # - name: Check out repository - # uses: actions/checkout@v4 - - # - name: Load cached output - # uses: actions/cache@v3 - # with: - # path: out/ - # key: benchmark-${{ runner.os }}-${{ hashFiles('Clustering.yaml') }} - - # - name: Prepare output - # run: | - # zip -r benchmark_output.zip out/ - # mkdir -p gh-pages - # cp out/plotting/plotting_report.html gh-pages/index.html - - # - name: Upload zipped output - # uses: actions/upload-artifact@v4 - # with: - # name: benchmark-output - # path: benchmark_output.zip - # retention-days: 7 - - # - name: Upload Pages Artifact - # uses: actions/upload-pages-artifact@v3 - # with: - # path: gh-pages - - # - name: Deploy to GitHub Pages - # uses: actions/deploy-pages@v4 - - # - name: Create Job Summary - # if: always() - # run: | - # echo "### Reports" >> $GITHUB_STEP_SUMMARY - # echo "- [Plotting Report](https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }})" >> $GITHUB_STEP_SUMMARY - # echo "### All Outputs" >> $GITHUB_STEP_SUMMARY - # echo "- [Complete Benchmark Output](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}#artifacts)" >> $GITHUB_STEP_SUMMARY -