From e713c22c774517cf2ff5e2b89677ec692a470c12 Mon Sep 17 00:00:00 2001 From: dyzheng Date: Thu, 27 Aug 2026 17:22:11 +0800 Subject: [PATCH 1/3] CI: use LTS-specific container images in workflows The LTS branch builds and pushes -lts suffixed containers (e.g. abacus-gnu-lts, abacus-cuda-lts) to isolate its packages from the develop branch. Update all consuming workflows to reference the -lts images so the GPU and CPU tests run in the correct LTS containers. --- .github/workflows/build_test_cmake.yml | 2 +- .github/workflows/build_test_makefile.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/cuda.yml | 2 +- .github/workflows/dynamic.yml | 2 +- .github/workflows/performance.yml | 2 +- .github/workflows/pytest.yml | 2 +- .github/workflows/test.yml | 2 +- .github/workflows/toolchain_full.yaml | 4 ++-- .github/workflows/toolchain_smoke.yaml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_test_cmake.yml b/.github/workflows/build_test_cmake.yml index 8938a1ede64..ccd131cb5e7 100644 --- a/.github/workflows/build_test_cmake.yml +++ b/.github/workflows/build_test_cmake.yml @@ -40,7 +40,7 @@ jobs: name: "Build without LCAO and MPI" name: ${{ matrix.name }} - container: ghcr.io/deepmodeling/abacus-${{ matrix.tag }} + container: ghcr.io/deepmodeling/abacus-${{ matrix.tag }}-lts steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/build_test_makefile.yml b/.github/workflows/build_test_makefile.yml index e2129a707f0..054ba77b18e 100644 --- a/.github/workflows/build_test_makefile.yml +++ b/.github/workflows/build_test_makefile.yml @@ -13,7 +13,7 @@ jobs: build_args: "CXX=mpiicpc ELPA_LIB_DIR=/usr/local/lib ELPA_INCLUDE_DIR=/usr/local/include CEREAL_DIR=/usr/include/cereal OPENMP=ON" name: "Build with Makefile & Intel compilers" name: ${{ matrix.name }} - container: ghcr.io/deepmodeling/abacus-${{ matrix.tag }} + container: ghcr.io/deepmodeling/abacus-${{ matrix.tag }}-lts steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 2e49b704706..eab82c4e205 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -9,7 +9,7 @@ jobs: test-coverage: name: Generate Coverage Report runs-on: X64 - container: ghcr.io/deepmodeling/abacus-gnu + container: ghcr.io/deepmodeling/abacus-gnu-lts steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml index 3e2bf218a0f..626d71aa57f 100644 --- a/.github/workflows/cuda.yml +++ b/.github/workflows/cuda.yml @@ -14,7 +14,7 @@ jobs: runs-on: nvidia if: github.repository_owner == 'deepmodeling' container: - image: ghcr.io/deepmodeling/abacus-cuda + image: ghcr.io/deepmodeling/abacus-cuda-lts volumes: - /tmp/ccache:/github/home/.ccache options: --gpus all diff --git a/.github/workflows/dynamic.yml b/.github/workflows/dynamic.yml index 85cb13482ee..f9ccde61995 100644 --- a/.github/workflows/dynamic.yml +++ b/.github/workflows/dynamic.yml @@ -10,7 +10,7 @@ jobs: name: Dynamic analysis runs-on: X64 if: github.repository_owner == 'deepmodeling' - container: ghcr.io/deepmodeling/abacus-gnu + container: ghcr.io/deepmodeling/abacus-gnu-lts steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index 589a85e5845..e776d479371 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: tag: ["gnu", "intel"] - container: ghcr.io/deepmodeling/abacus-${{ matrix.tag }} + container: ghcr.io/deepmodeling/abacus-${{ matrix.tag }}-lts timeout-minutes: 2880 steps: - name: Checkout diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 0470d5f050f..ecc96df68dc 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -8,7 +8,7 @@ jobs: name: PyTest runs-on: ubuntu-latest container: - image: ghcr.io/deepmodeling/abacus-gnu + image: ghcr.io/deepmodeling/abacus-gnu-lts steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 458c94d5766..227f4499a76 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: runs-on: X64 if: github.repository_owner == 'deepmodeling' container: - image: ghcr.io/deepmodeling/abacus-gnu + image: ghcr.io/deepmodeling/abacus-gnu-lts volumes: - /tmp/ccache:/github/home/.ccache steps: diff --git a/.github/workflows/toolchain_full.yaml b/.github/workflows/toolchain_full.yaml index 3793b22eafb..ad8bc2fc7d3 100644 --- a/.github/workflows/toolchain_full.yaml +++ b/.github/workflows/toolchain_full.yaml @@ -13,7 +13,7 @@ jobs: if: contains(inputs.variants || 'gnu,intel,cuda', 'gnu') runs-on: X64 container: - image: ghcr.io/deepmodeling/abacus-gnu + image: ghcr.io/deepmodeling/abacus-gnu-lts steps: - name: Checkout uses: actions/checkout@v6 @@ -52,7 +52,7 @@ jobs: if: contains(inputs.variants || 'gnu,intel,cuda', 'intel') runs-on: X64 container: - image: ghcr.io/deepmodeling/abacus-intel + image: ghcr.io/deepmodeling/abacus-intel-lts steps: - name: Checkout uses: actions/checkout@v6 diff --git a/.github/workflows/toolchain_smoke.yaml b/.github/workflows/toolchain_smoke.yaml index 7bd2c9ca44a..728b3608d45 100644 --- a/.github/workflows/toolchain_smoke.yaml +++ b/.github/workflows/toolchain_smoke.yaml @@ -11,7 +11,7 @@ jobs: smoke-build-gnu: runs-on: X64 container: - image: ghcr.io/deepmodeling/abacus-gnu + image: ghcr.io/deepmodeling/abacus-gnu-lts defaults: run: shell: bash From d9afc3580966bc040191ffcafd582a94fb4a60c6 Mon Sep 17 00:00:00 2001 From: dyzheng Date: Thu, 27 Aug 2026 17:47:48 +0800 Subject: [PATCH 2/3] Revert "CI: use LTS-specific container images in workflows" This reverts commit e713c22c774517cf2ff5e2b89677ec692a470c12. --- .github/workflows/build_test_cmake.yml | 2 +- .github/workflows/build_test_makefile.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/cuda.yml | 2 +- .github/workflows/dynamic.yml | 2 +- .github/workflows/performance.yml | 2 +- .github/workflows/pytest.yml | 2 +- .github/workflows/test.yml | 2 +- .github/workflows/toolchain_full.yaml | 4 ++-- .github/workflows/toolchain_smoke.yaml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_test_cmake.yml b/.github/workflows/build_test_cmake.yml index ccd131cb5e7..8938a1ede64 100644 --- a/.github/workflows/build_test_cmake.yml +++ b/.github/workflows/build_test_cmake.yml @@ -40,7 +40,7 @@ jobs: name: "Build without LCAO and MPI" name: ${{ matrix.name }} - container: ghcr.io/deepmodeling/abacus-${{ matrix.tag }}-lts + container: ghcr.io/deepmodeling/abacus-${{ matrix.tag }} steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/build_test_makefile.yml b/.github/workflows/build_test_makefile.yml index 054ba77b18e..e2129a707f0 100644 --- a/.github/workflows/build_test_makefile.yml +++ b/.github/workflows/build_test_makefile.yml @@ -13,7 +13,7 @@ jobs: build_args: "CXX=mpiicpc ELPA_LIB_DIR=/usr/local/lib ELPA_INCLUDE_DIR=/usr/local/include CEREAL_DIR=/usr/include/cereal OPENMP=ON" name: "Build with Makefile & Intel compilers" name: ${{ matrix.name }} - container: ghcr.io/deepmodeling/abacus-${{ matrix.tag }}-lts + container: ghcr.io/deepmodeling/abacus-${{ matrix.tag }} steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index eab82c4e205..2e49b704706 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -9,7 +9,7 @@ jobs: test-coverage: name: Generate Coverage Report runs-on: X64 - container: ghcr.io/deepmodeling/abacus-gnu-lts + container: ghcr.io/deepmodeling/abacus-gnu steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml index 626d71aa57f..3e2bf218a0f 100644 --- a/.github/workflows/cuda.yml +++ b/.github/workflows/cuda.yml @@ -14,7 +14,7 @@ jobs: runs-on: nvidia if: github.repository_owner == 'deepmodeling' container: - image: ghcr.io/deepmodeling/abacus-cuda-lts + image: ghcr.io/deepmodeling/abacus-cuda volumes: - /tmp/ccache:/github/home/.ccache options: --gpus all diff --git a/.github/workflows/dynamic.yml b/.github/workflows/dynamic.yml index f9ccde61995..85cb13482ee 100644 --- a/.github/workflows/dynamic.yml +++ b/.github/workflows/dynamic.yml @@ -10,7 +10,7 @@ jobs: name: Dynamic analysis runs-on: X64 if: github.repository_owner == 'deepmodeling' - container: ghcr.io/deepmodeling/abacus-gnu-lts + container: ghcr.io/deepmodeling/abacus-gnu steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index e776d479371..589a85e5845 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: tag: ["gnu", "intel"] - container: ghcr.io/deepmodeling/abacus-${{ matrix.tag }}-lts + container: ghcr.io/deepmodeling/abacus-${{ matrix.tag }} timeout-minutes: 2880 steps: - name: Checkout diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index ecc96df68dc..0470d5f050f 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -8,7 +8,7 @@ jobs: name: PyTest runs-on: ubuntu-latest container: - image: ghcr.io/deepmodeling/abacus-gnu-lts + image: ghcr.io/deepmodeling/abacus-gnu steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 227f4499a76..458c94d5766 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: runs-on: X64 if: github.repository_owner == 'deepmodeling' container: - image: ghcr.io/deepmodeling/abacus-gnu-lts + image: ghcr.io/deepmodeling/abacus-gnu volumes: - /tmp/ccache:/github/home/.ccache steps: diff --git a/.github/workflows/toolchain_full.yaml b/.github/workflows/toolchain_full.yaml index ad8bc2fc7d3..3793b22eafb 100644 --- a/.github/workflows/toolchain_full.yaml +++ b/.github/workflows/toolchain_full.yaml @@ -13,7 +13,7 @@ jobs: if: contains(inputs.variants || 'gnu,intel,cuda', 'gnu') runs-on: X64 container: - image: ghcr.io/deepmodeling/abacus-gnu-lts + image: ghcr.io/deepmodeling/abacus-gnu steps: - name: Checkout uses: actions/checkout@v6 @@ -52,7 +52,7 @@ jobs: if: contains(inputs.variants || 'gnu,intel,cuda', 'intel') runs-on: X64 container: - image: ghcr.io/deepmodeling/abacus-intel-lts + image: ghcr.io/deepmodeling/abacus-intel steps: - name: Checkout uses: actions/checkout@v6 diff --git a/.github/workflows/toolchain_smoke.yaml b/.github/workflows/toolchain_smoke.yaml index 728b3608d45..7bd2c9ca44a 100644 --- a/.github/workflows/toolchain_smoke.yaml +++ b/.github/workflows/toolchain_smoke.yaml @@ -11,7 +11,7 @@ jobs: smoke-build-gnu: runs-on: X64 container: - image: ghcr.io/deepmodeling/abacus-gnu-lts + image: ghcr.io/deepmodeling/abacus-gnu defaults: run: shell: bash From 96fe8dfadd2b5cd00d310f1fb84be317fe542dec Mon Sep 17 00:00:00 2001 From: dyzheng Date: Thu, 27 Aug 2026 17:51:13 +0800 Subject: [PATCH 3/3] Revert "CI: isolate LTS container packages (#7781)" This reverts commit e148bc424e2cd327b31f7453d5e375e4c27d6599. --- .github/workflows/devcontainer.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml index 74e1118026f..0e744d3ead2 100644 --- a/.github/workflows/devcontainer.yml +++ b/.github/workflows/devcontainer.yml @@ -26,8 +26,8 @@ jobs: uses: docker/metadata-action@v5 with: images: | - ghcr.io/deepmodeling/abacus-${{ matrix.dockerfile }}-lts - dp-harbor-registry.us-east-1.cr.aliyuncs.com/deepmodeling/abacus-${{ matrix.dockerfile }}-lts + ghcr.io/deepmodeling/abacus-${{ matrix.dockerfile }} + dp-harbor-registry.us-east-1.cr.aliyuncs.com/deepmodeling/abacus-${{ matrix.dockerfile }} tags: | type=semver,pattern={{version}},enable=${{ github.ref_type == 'tag' }} type=raw,value=latest @@ -57,5 +57,5 @@ jobs: labels: ${{ steps.meta.outputs.labels }} file: Dockerfile.${{ matrix.dockerfile }} push: true - cache-from: type=registry,ref=ghcr.io/deepmodeling/abacus-${{ matrix.dockerfile }}-lts:latest + cache-from: type=registry,ref=ghcr.io/deepmodeling/abacus-${{ matrix.dockerfile }}:latest cache-to: type=inline