From c10882c1a20cd5b5021d497e61237fda979da3fd Mon Sep 17 00:00:00 2001 From: liamhuber Date: Mon, 13 May 2024 09:50:12 -0700 Subject: [PATCH 1/6] Test new CI tools to the exclusion of all else --- .github/workflows/daily.yml | 14 -------------- .github/workflows/dependabot-pr.yml | 10 ---------- .github/workflows/pr-labeled.yml | 12 ------------ .github/workflows/pr-target-opened.yml | 12 ------------ .github/workflows/push-pull.yml | 10 ++++------ .github/workflows/release.yml | 14 -------------- .github/workflows/weekly.yml | 12 ------------ 7 files changed, 4 insertions(+), 80 deletions(-) delete mode 100644 .github/workflows/daily.yml delete mode 100644 .github/workflows/dependabot-pr.yml delete mode 100644 .github/workflows/pr-labeled.yml delete mode 100644 .github/workflows/pr-target-opened.yml delete mode 100644 .github/workflows/release.yml delete mode 100644 .github/workflows/weekly.yml diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml deleted file mode 100644 index 3dbe355..0000000 --- a/.github/workflows/daily.yml +++ /dev/null @@ -1,14 +0,0 @@ -# This runs cron jobs daily - -name: Daily - -on: - schedule: - - cron: '00 23 * * *' - -jobs: - Tests-and-Coverage: - uses: pyiron/actions/.github/workflows/tests-and-coverage.yml@actions-2.0.7 - secrets: inherit - with: - tests-env-files: .ci_support/environment.yml .ci_support/environment-pyiron_atomistics.yml diff --git a/.github/workflows/dependabot-pr.yml b/.github/workflows/dependabot-pr.yml deleted file mode 100644 index 15ee4b1..0000000 --- a/.github/workflows/dependabot-pr.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: UpdateDependabotPR - -on: - pull_request_target: - branches: [ main ] - -jobs: - pyiron: - uses: pyiron/actions/.github/workflows/dependabot-pr.yml@actions-2.0.7 - secrets: inherit \ No newline at end of file diff --git a/.github/workflows/pr-labeled.yml b/.github/workflows/pr-labeled.yml deleted file mode 100644 index 670d948..0000000 --- a/.github/workflows/pr-labeled.yml +++ /dev/null @@ -1,12 +0,0 @@ -# This runs jobs which pyiron modules should run when a PR is labeled - -name: PR labeled - -on: - pull_request: - types: [labeled] - -jobs: - pyiron: - uses: pyiron/actions/.github/workflows/pr-labeled.yml@actions-2.0.7 - secrets: inherit \ No newline at end of file diff --git a/.github/workflows/pr-target-opened.yml b/.github/workflows/pr-target-opened.yml deleted file mode 100644 index 48b14f1..0000000 --- a/.github/workflows/pr-target-opened.yml +++ /dev/null @@ -1,12 +0,0 @@ -# This runs jobs which pyiron modules should run when a PR target is opened - -name: PR opened - -on: - pull_request_target: - types: [opened] - -jobs: - pyiron: - uses: pyiron/actions/.github/workflows/pr-target-opened.yml@actions-2.0.7 - secrets: inherit \ No newline at end of file diff --git a/.github/workflows/push-pull.yml b/.github/workflows/push-pull.yml index 20b0462..e6b6208 100644 --- a/.github/workflows/push-pull.yml +++ b/.github/workflows/push-pull.yml @@ -9,10 +9,8 @@ on: jobs: pyiron: - uses: pyiron/actions/.github/workflows/push-pull.yml@actions-2.0.7 - secrets: inherit + runs-on: ubuntu-latest + uses: pyiron/actions/cached-miniforge@update_env_setup with: - docs-env-files: .ci_support/environment.yml .ci_support/environment-docs.yml - notebooks-env-files: .ci_support/environment.yml .ci_support/environment-pyiron_atomistics.yml .ci_support/environment-lammps.yml - tests-env-files: .ci_support/environment.yml .ci_support/environment-pyiron_atomistics.yml - alternate-tests-env-files: .ci_support/lower_bound.yml \ No newline at end of file + runner-name: ${{ runner.name }} + python-version: '3.11' \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 500d7e3..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,14 +0,0 @@ -# This runs jobs which pyiron modules should run on release -name: Release - -on: - release: - types: [ published ] - -jobs: - pyiron: - uses: pyiron/actions/.github/workflows/pyproject-release.yml@actions-2.0.7 - secrets: inherit - with: - semantic-upper-bound: 'minor' - lower-bound-yaml: '.ci_support/lower_bound.yml' \ No newline at end of file diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml deleted file mode 100644 index 40f3262..0000000 --- a/.github/workflows/weekly.yml +++ /dev/null @@ -1,12 +0,0 @@ -# This runs cron jobs weekly - -name: Weekly - -on: - schedule: - - cron: '0 23 * * 2' - -jobs: - codeql: - uses: pyiron/actions/.github/workflows/codeql.yml@actions-2.0.7 - secrets: inherit \ No newline at end of file From 1bc869146c0cb9390230165b4bc403d99367324e Mon Sep 17 00:00:00 2001 From: liamhuber Date: Mon, 13 May 2024 09:54:42 -0700 Subject: [PATCH 2/6] Actions should be a step --- .github/workflows/push-pull.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push-pull.yml b/.github/workflows/push-pull.yml index e6b6208..7ef6f8c 100644 --- a/.github/workflows/push-pull.yml +++ b/.github/workflows/push-pull.yml @@ -10,7 +10,8 @@ on: jobs: pyiron: runs-on: ubuntu-latest - uses: pyiron/actions/cached-miniforge@update_env_setup - with: - runner-name: ${{ runner.name }} - python-version: '3.11' \ No newline at end of file + steps: + - uses: pyiron/actions/cached-miniforge@update_env_setup + with: + runner-name: ${{ runner.name }} + python-version: '3.11' \ No newline at end of file From 5bf42b2c76dddb42c8f6c883e699b06944ce44af Mon Sep 17 00:00:00 2001 From: liamhuber Date: Mon, 13 May 2024 10:12:34 -0700 Subject: [PATCH 3/6] Run checkout --- .github/workflows/push-pull.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/push-pull.yml b/.github/workflows/push-pull.yml index 7ef6f8c..7f208f3 100644 --- a/.github/workflows/push-pull.yml +++ b/.github/workflows/push-pull.yml @@ -11,6 +11,7 @@ jobs: pyiron: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v4 - uses: pyiron/actions/cached-miniforge@update_env_setup with: runner-name: ${{ runner.name }} From dd9a19ba512c02a480bf97e16c32177fb7b0f253 Mon Sep 17 00:00:00 2001 From: liamhuber Date: Mon, 13 May 2024 10:27:01 -0700 Subject: [PATCH 4/6] Don't pass runner info --- .github/workflows/push-pull.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/push-pull.yml b/.github/workflows/push-pull.yml index 7f208f3..33fc942 100644 --- a/.github/workflows/push-pull.yml +++ b/.github/workflows/push-pull.yml @@ -14,5 +14,4 @@ jobs: - uses: actions/checkout@v4 - uses: pyiron/actions/cached-miniforge@update_env_setup with: - runner-name: ${{ runner.name }} python-version: '3.11' \ No newline at end of file From 5696916f0cb9ee66ee4e1475f736f61e5e05286b Mon Sep 17 00:00:00 2001 From: liamhuber Date: Mon, 13 May 2024 12:08:49 -0700 Subject: [PATCH 5/6] Bump the cache --- .github/workflows/push-pull.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push-pull.yml b/.github/workflows/push-pull.yml index 33fc942..c02cf60 100644 --- a/.github/workflows/push-pull.yml +++ b/.github/workflows/push-pull.yml @@ -14,4 +14,5 @@ jobs: - uses: actions/checkout@v4 - uses: pyiron/actions/cached-miniforge@update_env_setup with: - python-version: '3.11' \ No newline at end of file + python-version: '3.11' + cache-number: 1 \ No newline at end of file From 2bbcb494e309f48e2034e157dd75e38ef601cea9 Mon Sep 17 00:00:00 2001 From: liamhuber Date: Mon, 13 May 2024 12:14:03 -0700 Subject: [PATCH 6/6] Force-ignore the cache --- .github/workflows/push-pull.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push-pull.yml b/.github/workflows/push-pull.yml index c02cf60..d05c620 100644 --- a/.github/workflows/push-pull.yml +++ b/.github/workflows/push-pull.yml @@ -15,4 +15,5 @@ jobs: - uses: pyiron/actions/cached-miniforge@update_env_setup with: python-version: '3.11' - cache-number: 1 \ No newline at end of file + cache-number: 1 + use-cache: false \ No newline at end of file