From 06b5c356b417ab1735ec8aff137a80f7c85b0a92 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Fri, 17 Feb 2023 12:41:52 +0000 Subject: [PATCH 1/2] removed unused circle ci script --- .old_circle/config.yml | 124 ----------------------------------------- 1 file changed, 124 deletions(-) delete mode 100644 .old_circle/config.yml diff --git a/.old_circle/config.yml b/.old_circle/config.yml deleted file mode 100644 index 7943fc802a..0000000000 --- a/.old_circle/config.yml +++ /dev/null @@ -1,124 +0,0 @@ -version: 2.1 -jobs: - house_keeping: - parameters: - img: - type: string - docker: - - image: svalinn/dagmc-ci-ubuntu-18.04-housekeeping:latest - auth: - username: $DOCKERHUB_USER - password: $DOCKERHUB_PASS - working_directory: /root/build_dir/DAGMC - steps: - - checkout - - run: - name: Setup environment - command: | - echo "export REPO_SLUG=${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PR_REPONAME}" >> $BASH_ENV - echo "export PULL_REQUEST=${CIRCLE_PR_NUMBER}" >> $BASH_ENV - - run: - name: Housekeeping - command: CI/scripts/housekeeping.sh - - build_and_test: - parameters: - img: - type: string - compiler: - type: string - hdf5: - type: string - moab: - type: string - double_down: - type: string - default: "OFF" - docker: - - image: svalinn/dagmc-ci-ubuntu-<< parameters.img >>-<< parameters.compiler >>-ext-hdf5_<< parameters.hdf5 >>-moab_<< parameters.moab >>:latest - auth: - username: $DOCKERHUB_USER - password: $DOCKERHUB_PASS - working_directory: /root/build_dir/DAGMC - steps: - - checkout - - run: - name: Setup environment - command: | - echo "export COMPILER=<< parameters.compiler >>" >> $BASH_ENV - echo "export MOAB_VERSION=<< parameters.moab >>" >> $BASH_ENV - echo "export HDF5_VERSION=<< parameters.hdf5 >>" >> $BASH_ENV - echo "export REPO_SLUG=${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PR_REPONAME}" >> $BASH_ENV - echo "export PULL_REQUEST=${CIRCLE_PR_NUMBER}" >> $BASH_ENV - echo "export DOUBLE_DOWN=<< parameters.double_down >>" >> $BASH_ENV - - run: - name: Building DAGMC - command: CI/scripts/install.sh - - run: - name: Testing DAGMC - command: CI/scripts/tests.sh - -workflows: - version: 2 - pull_request: # Run only for PullRequest - jobs: - - - house_keeping: - context: dockerhub - matrix: - parameters: - img: ["18.04"] - filters: - branches: - ignore: develop - - - build_and_test: - context: dockerhub - matrix: - parameters: - img: [ "16.04", "18.04"] - compiler: ["clang", "gcc"] - hdf5: ["1.10.4"] - moab: ["9c96d17"] - requires: - - house_keeping - filters: - branches: - ignore: develop - - - build_and_test: - context: dockerhub - name: "Double-Down" - img: "18.04" - compiler: "gcc" - hdf5: "1.10.4" - moab: "master" - double_down: "ON" - filters: - branches: - ignore: develop - - merge: # Run only on develop change -> when merging a PullRequest - jobs: - - build_and_test: - context: dockerhub - matrix: - parameters: - img: [ "16.04", "18.04"] - compiler: ["clang", "gcc"] - hdf5: ["1.10.4"] - moab: ["9c96d17", "develop", "master"] - filters: - branches: - only: develop - - build_and_test: - context: dockerhub - name: "Double-Down" - img: "18.04" - compiler: "gcc" - hdf5: "1.10.4" - moab: "master" - double_down: "ON" - filters: - branches: - only: develop From e14db933b51cc028b04826bea4c0e9ee1d14f459 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Fri, 17 Feb 2023 12:45:38 +0000 Subject: [PATCH 2/2] updated changelog with 851 --- doc/CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index 5e6912f463..3b8da12a76 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -16,6 +16,7 @@ Next version * Update Pyne submodule (#845) * Update Pyne submodule (#848) * Minor typo fixes in documentation (#851) + * Removed unused Circle CI yml (#859) v3.2.2