From 36afcc06bcf44962e3975c6917864f413b9e2283 Mon Sep 17 00:00:00 2001 From: Co Quach Date: Mon, 4 Dec 2023 11:50:10 -0600 Subject: [PATCH 1/7] udpate ci.yml to use latest docker actions --- .github/workflows/CI.yaml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 53a8d4175..698c4bb5b 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -20,9 +20,6 @@ jobs: matrix: os: [macOS-latest, ubuntu-latest, windows-latest] python-version: ["3.9", "3.10", "3.11"] - exclude: - - os: windows-latest - python-version: 3.8 defaults: run: @@ -36,14 +33,16 @@ jobs: uses: mamba-org/setup-micromamba@v1 with: environment-file: environment-dev.yml - python-version: ${{ matrix.python-version }} + create-args: >- + python=${{ matrix.python-version }} if: runner.os != 'Windows' - name: Install Mamba (Windows) uses: mamba-org/setup-micromamba@v1 with: environment-file: environment-dev-win.yml - python-version: ${{ matrix.python-version }} + create-args: >- + python=${{ matrix.python-version }} if: runner.os == 'Windows' - name: Install Package @@ -81,7 +80,7 @@ jobs: uses: mamba-org/setup-micromamba@v1 with: environment-file: environment-dev.yml - python-version: "3.10" + create-args: python=3.11 - name: Clone Foyer and GMSO run: | @@ -111,10 +110,10 @@ jobs: steps: - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} @@ -134,7 +133,7 @@ jobs: echo Docker Image tags: ${DOCKER_TAGS} - name: Build and Push - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: push: true tags: ${{ env.DOCKER_TAGS }} From e1bebaddf4538ab21162e19bc7a9218c596b972a Mon Sep 17 00:00:00 2001 From: Co Quach Date: Mon, 4 Dec 2023 11:54:58 -0600 Subject: [PATCH 2/7] update dockerfile --- Dockerfile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4f81318d5..608ed9ef2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,17 +17,15 @@ WORKDIR /mbuild # Create a group and user RUN addgroup -S anaconda && adduser -S anaconda -G anaconda -# install the libarchive package needed by mamba -RUN apk update && apk add libarchive - -RUN conda update conda -yq && \ +RUN apk update && apk add libarchive &&\ + conda update conda -yq && \ conda config --set always_yes yes --set changeps1 no && \ . /opt/conda/etc/profile.d/conda.sh && \ - sed -i -E "s/python.*$/python="$(PY_VERSION)"/" environment-dev.yml && \ + sed -i -E "s/python.*$/python="$(PY_VERSION)"/" environment.yml && \ conda install -c conda-forge mamba && \ - mamba env create nomkl --file environment-dev.yml && \ + mamba env create --file environment-dev.yml && \ conda activate mbuild-dev && \ - mamba install -c conda-forge nomkl jupyter python="$PY_VERSION" && \ + mamba install -c conda-forge jupyter python="$PY_VERSION" && \ python setup.py install && \ echo "source activate mbuild-dev" >> \ /home/anaconda/.profile && \ @@ -37,7 +35,6 @@ RUN conda update conda -yq && \ chown -R anaconda:anaconda /opt && \ chown -R anaconda:anaconda /home/anaconda - WORKDIR /home/anaconda COPY devtools/docker-entrypoint.sh /entrypoint.sh From 26d190a8ce0caf6b05ab212c129c4c8be8aeb62b Mon Sep 17 00:00:00 2001 From: Co Quach Date: Mon, 4 Dec 2023 12:07:19 -0600 Subject: [PATCH 3/7] add back excludes for lower windows build --- .github/workflows/CI.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 698c4bb5b..a90d61e1a 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -20,6 +20,9 @@ jobs: matrix: os: [macOS-latest, ubuntu-latest, windows-latest] python-version: ["3.9", "3.10", "3.11"] + exclude: + - os: windows-latest + python-version: ["3.9", "3.10"] defaults: run: From d329ed161c84714656c3f23cac9a70c605dfcade Mon Sep 17 00:00:00 2001 From: Co Quach Date: Mon, 4 Dec 2023 13:24:32 -0600 Subject: [PATCH 4/7] rewrite exclude --- .github/workflows/CI.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index a90d61e1a..5cbdee07a 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -22,7 +22,9 @@ jobs: python-version: ["3.9", "3.10", "3.11"] exclude: - os: windows-latest - python-version: ["3.9", "3.10"] + python-version: "3.9" + - os: windows-latest + python-version: "3.10" defaults: run: From b30142525c0a36ad7f94028a7996746318e3fef1 Mon Sep 17 00:00:00 2001 From: Co Quach Date: Mon, 4 Dec 2023 14:53:18 -0600 Subject: [PATCH 5/7] fix typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 608ed9ef2..b0a624727 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN apk update && apk add libarchive &&\ conda update conda -yq && \ conda config --set always_yes yes --set changeps1 no && \ . /opt/conda/etc/profile.d/conda.sh && \ - sed -i -E "s/python.*$/python="$(PY_VERSION)"/" environment.yml && \ + sed -i -E "s/python.*$/python="$(PY_VERSION)"/" environment-dev.yml && \ conda install -c conda-forge mamba && \ mamba env create --file environment-dev.yml && \ conda activate mbuild-dev && \ From e74b32f8696a406b069f1fe3a01e51dce09eac89 Mon Sep 17 00:00:00 2001 From: Co Quach Date: Mon, 4 Dec 2023 15:47:14 -0600 Subject: [PATCH 6/7] try include instead of exclude --- .github/workflows/CI.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 5cbdee07a..60a708476 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -20,11 +20,9 @@ jobs: matrix: os: [macOS-latest, ubuntu-latest, windows-latest] python-version: ["3.9", "3.10", "3.11"] - exclude: + include: - os: windows-latest - python-version: "3.9" - - os: windows-latest - python-version: "3.10" + python-version: "3.11" defaults: run: From 2743a7c31049f9e08cb6568a1276cb81ef171e4b Mon Sep 17 00:00:00 2001 From: Co Quach Date: Mon, 4 Dec 2023 16:54:22 -0600 Subject: [PATCH 7/7] remove windows-latest from matrix --- .github/workflows/CI.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 60a708476..9feae3edc 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macOS-latest, ubuntu-latest, windows-latest] + os: [macOS-latest, ubuntu-latest] python-version: ["3.9", "3.10", "3.11"] include: - os: windows-latest