From 1d6671b136471fc76c4f9c38fa6e5ff104d8cd9e Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Tue, 16 Jul 2024 12:05:14 +0200 Subject: [PATCH 1/5] Test a new CI system --- .github/workflows/dependencytest-workflow.yml | 35 ---------------- .../workflows/jlpkgbutler-butler-workflow.yml | 22 ---------- .../jlpkgbutler-ci-master-workflow.yml | 42 ------------------- .../workflows/jlpkgbutler-ci-pr-workflow.yml | 38 ----------------- .../jlpkgbutler-compathelper-workflow.yml | 20 --------- .../jlpkgbutler-docdeploy-workflow.yml | 23 ---------- .../workflows/jlpkgbutler-tagbot-workflow.yml | 17 -------- .github/workflows/test.yml | 16 +++++++ 8 files changed, 16 insertions(+), 197 deletions(-) delete mode 100644 .github/workflows/dependencytest-workflow.yml delete mode 100644 .github/workflows/jlpkgbutler-butler-workflow.yml delete mode 100644 .github/workflows/jlpkgbutler-ci-master-workflow.yml delete mode 100644 .github/workflows/jlpkgbutler-ci-pr-workflow.yml delete mode 100644 .github/workflows/jlpkgbutler-compathelper-workflow.yml delete mode 100644 .github/workflows/jlpkgbutler-docdeploy-workflow.yml delete mode 100644 .github/workflows/jlpkgbutler-tagbot-workflow.yml create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/dependencytest-workflow.yml b/.github/workflows/dependencytest-workflow.yml deleted file mode 100644 index 0392a1dfb..000000000 --- a/.github/workflows/dependencytest-workflow.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Run model tests - -on: - push: - branches: - - master - schedule: - - cron: '0 23 * * *' - -jobs: - test: - runs-on: ${{ matrix.os }} - strategy: - matrix: - julia-version: ['1.9', '1.10'] - julia-arch: [x64, x86] - os: [ubuntu-latest, windows-latest, macOS-latest] - exclude: - - os: macOS-latest - julia-arch: x86 - - os: ubuntu-latest - julia-arch: x86 - - steps: - - uses: actions/checkout@v1.0.0 - - uses: julia-actions/setup-julia@latest - with: - version: ${{ matrix.julia-version }} - - uses: julia-actions/julia-buildpkg@latest - env: - PYTHON: "" - - name: Run dependency tests - run: julia test/dependencies/run_dependency_tests.jl - env: - PYTHON: "" diff --git a/.github/workflows/jlpkgbutler-butler-workflow.yml b/.github/workflows/jlpkgbutler-butler-workflow.yml deleted file mode 100644 index 70544cc99..000000000 --- a/.github/workflows/jlpkgbutler-butler-workflow.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Run the Julia Package Butler - -on: - push: - branches: - - main - - master - schedule: - - cron: '0 */1 * * *' - workflow_dispatch: - -jobs: - butler: - name: "Run Package Butler" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: davidanthoff/julia-pkgbutler@releases/v1 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - ssh-private-key: ${{ secrets.JLPKGBUTLER_TOKEN }} - channel: stable diff --git a/.github/workflows/jlpkgbutler-ci-master-workflow.yml b/.github/workflows/jlpkgbutler-ci-master-workflow.yml deleted file mode 100644 index 28b6c4fb8..000000000 --- a/.github/workflows/jlpkgbutler-ci-master-workflow.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Run CI on main - -on: - push: - branches: - - main - - master - workflow_dispatch: - -jobs: - test: - runs-on: ${{ matrix.os }} - strategy: - matrix: - julia-version: ['1.6', '1.7', '1.8', '1.9', '1.10'] - julia-arch: [x64, x86] - os: [ubuntu-latest, windows-latest, macOS-latest] - exclude: - - os: macOS-latest - julia-arch: x86 - - os: ubuntu-latest - julia-arch: x86 - - steps: - - uses: actions/checkout@v3 - - uses: julia-actions/setup-julia@v1 - with: - version: ${{ matrix.julia-version }} - arch: ${{ matrix.julia-arch }} - - uses: julia-actions/julia-buildpkg@v1 - env: - PYTHON: "" - - uses: julia-actions/julia-runtest@v1 - env: - PYTHON: "" - - uses: julia-actions/julia-processcoverage@v1 - - uses: codecov/codecov-action@v3 - with: - files: ./lcov.info - flags: unittests - token: ${{ secrets.CODECOV_TOKEN }} - \ No newline at end of file diff --git a/.github/workflows/jlpkgbutler-ci-pr-workflow.yml b/.github/workflows/jlpkgbutler-ci-pr-workflow.yml deleted file mode 100644 index 1c1a86211..000000000 --- a/.github/workflows/jlpkgbutler-ci-pr-workflow.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Run CI on PR - -on: - pull_request: - types: [opened, synchronize, reopened] - -jobs: - test: - runs-on: ${{ matrix.os }} - strategy: - matrix: - julia-version: ['1.6', '1.7', '1.8', '1.9', '1.10'] - julia-arch: [x64, x86] - os: [ubuntu-latest, windows-latest, macOS-latest] - exclude: - - os: macOS-latest - julia-arch: x86 - - os: ubuntu-latest - julia-arch: x86 - - steps: - - uses: actions/checkout@v3 - - uses: julia-actions/setup-julia@v1 - with: - version: ${{ matrix.julia-version }} - arch: ${{ matrix.julia-arch }} - - uses: julia-actions/julia-buildpkg@v1 - env: - PYTHON: "" - - uses: julia-actions/julia-runtest@v1 - env: - PYTHON: "" - - uses: julia-actions/julia-processcoverage@v1 - - uses: codecov/codecov-action@v3 - with: - files: ./lcov.info - flags: unittests - token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/jlpkgbutler-compathelper-workflow.yml b/.github/workflows/jlpkgbutler-compathelper-workflow.yml deleted file mode 100644 index b31583129..000000000 --- a/.github/workflows/jlpkgbutler-compathelper-workflow.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Run CompatHelper - -on: - schedule: - - cron: '00 * * * *' - issues: - types: [opened, reopened] - workflow_dispatch: - -jobs: - CompatHelper: - name: "Run CompatHelper.jl" - runs-on: ubuntu-latest - steps: - - name: Pkg.add("CompatHelper") - run: julia -e 'using Pkg; Pkg.add("CompatHelper")' - - name: CompatHelper.main() - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: julia -e 'using CompatHelper; CompatHelper.main()' diff --git a/.github/workflows/jlpkgbutler-docdeploy-workflow.yml b/.github/workflows/jlpkgbutler-docdeploy-workflow.yml deleted file mode 100644 index e517ba17f..000000000 --- a/.github/workflows/jlpkgbutler-docdeploy-workflow.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Deploy documentation - -on: - push: - branches: - - main - - master - tags: - - v* - workflow_dispatch: - -jobs: - docdeploy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: julia-actions/julia-buildpkg@v1 - env: - PYTHON: "" - - uses: julia-actions/julia-docdeploy@latest - env: - DOCUMENTER_KEY: ${{ secrets.JLPKGBUTLER_TOKEN }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/jlpkgbutler-tagbot-workflow.yml b/.github/workflows/jlpkgbutler-tagbot-workflow.yml deleted file mode 100644 index d3ca956ea..000000000 --- a/.github/workflows/jlpkgbutler-tagbot-workflow.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: TagBot -on: - issue_comment: - types: - - created - workflow_dispatch: - -jobs: - TagBot: - if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot' - runs-on: ubuntu-latest - steps: - - uses: JuliaRegistries/TagBot@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - ssh: ${{ secrets.JLPKGBUTLER_TOKEN }} - branches: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 000000000..eac22460e --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,16 @@ +name: NEW MAIN CI + +on: + push: + branches: + - main + - master + pull_request: + types: [opened, synchronize, reopened] + workflow_dispatch: + +jobs: + julia-ci: + uses: julia-vscode/testitem-workflow/.github/workflows/testitemci.yml@main + secrets: + codecov_token: ${{ secrets.CODECOV_TOKEN }} From e86978cfa0cfc87c7f48b40842aa70794d4c8289 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Tue, 16 Jul 2024 17:38:50 +0200 Subject: [PATCH 2/5] Fix tests --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eac22460e..0d2f0013f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,5 +12,7 @@ on: jobs: julia-ci: uses: julia-vscode/testitem-workflow/.github/workflows/testitemci.yml@main + with: + include-linux-x86: false secrets: codecov_token: ${{ secrets.CODECOV_TOKEN }} From 28373e5bb4cc33b5174a07155b424b082f1da055 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Tue, 16 Jul 2024 18:14:00 +0200 Subject: [PATCH 3/5] Try new options --- .github/workflows/test.yml | 2 ++ test/github_job_prep.jl | 1 + 2 files changed, 3 insertions(+) create mode 100644 test/github_job_prep.jl diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0d2f0013f..3f6df4031 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,5 +14,7 @@ jobs: uses: julia-vscode/testitem-workflow/.github/workflows/testitemci.yml@main with: include-linux-x86: false + github_job_prep_script: test/github_job_prep.jl + env: '{"DISPLAY": ":99"}' secrets: codecov_token: ${{ secrets.CODECOV_TOKEN }} diff --git a/test/github_job_prep.jl b/test/github_job_prep.jl new file mode 100644 index 000000000..6c6e20ced --- /dev/null +++ b/test/github_job_prep.jl @@ -0,0 +1 @@ +run(Cmd(`Xvfb :99 -screen 0 1024x768x24`, detach=true), wait=false) From 84d1371163deb7ff35054e0dddc9ad53cd8a2814 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Tue, 16 Jul 2024 18:15:08 +0200 Subject: [PATCH 4/5] More fixes --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3f6df4031..4c1d8c2f6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,6 +15,6 @@ jobs: with: include-linux-x86: false github_job_prep_script: test/github_job_prep.jl - env: '{"DISPLAY": ":99"}' + env: '{"DISPLAY": ":99", "PYTHON": ""}' secrets: codecov_token: ${{ secrets.CODECOV_TOKEN }} From 738c166a7cd1ad6b1e308b7076c11e5a48ec2359 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Tue, 16 Jul 2024 18:19:12 +0200 Subject: [PATCH 5/5] Fix --- test/github_job_prep.jl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/github_job_prep.jl b/test/github_job_prep.jl index 6c6e20ced..ca86d8723 100644 --- a/test/github_job_prep.jl +++ b/test/github_job_prep.jl @@ -1 +1,3 @@ -run(Cmd(`Xvfb :99 -screen 0 1024x768x24`, detach=true), wait=false) +if Sys.islinux() + run(Cmd(`Xvfb :99 -screen 0 1024x768x24`, detach=true), wait=false) +end