From 2edccabe019ed2a1d755a8d10bde8fe4021a12dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 10:47:41 +0000 Subject: [PATCH 1/4] Bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build_wheel.yml | 4 ++-- .github/workflows/package_c.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index e700109cce..9db0e5776d 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -77,7 +77,7 @@ jobs: DP_VARIANT: ${{ matrix.dp_variant }} CUDA_VERSION: ${{ matrix.cuda_version }} DP_PKG_NAME: ${{ matrix.dp_pkg_name }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl build_sdist: @@ -96,7 +96,7 @@ jobs: - name: Build sdist run: python -m build --sdist - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: dist/*.tar.gz diff --git a/.github/workflows/package_c.yml b/.github/workflows/package_c.yml index 2b5f74b97d..b9b7857db5 100644 --- a/.github/workflows/package_c.yml +++ b/.github/workflows/package_c.yml @@ -28,7 +28,7 @@ jobs: if: matrix.filename != 'libdeepmd_c.tar.gz' # for download and debug - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: libdeepmd_c path: ${{ matrix.filename }} From ff3584ffcf87d389504553677f0a94a79678dd77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 10:47:45 +0000 Subject: [PATCH 2/4] Bump actions/download-artifact from 3 to 4 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build_wheel.yml | 6 +++--- .github/workflows/package_c.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index e700109cce..419569c21a 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -108,7 +108,7 @@ jobs: id-token: write if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: artifact path: dist @@ -128,7 +128,7 @@ jobs: cuda_version: "11" steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: artifact path: source/install/docker/dist @@ -160,7 +160,7 @@ jobs: needs: [build_wheels, build_sdist] runs-on: ubuntu-latest steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: artifact path: dist/packages diff --git a/.github/workflows/package_c.yml b/.github/workflows/package_c.yml index 2b5f74b97d..1d89a7f46e 100644 --- a/.github/workflows/package_c.yml +++ b/.github/workflows/package_c.yml @@ -46,7 +46,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Download artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: libdeepmd_c - run: tar -vxzf ./libdeepmd_c.tar.gz From d213919db79538964425cdb22c5d03b879363ede Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Tue, 19 Dec 2023 18:29:40 -0500 Subject: [PATCH 3/4] update workflows for v4 of upload-artifact and download-artifact actions --- .github/workflows/build_wheel.yml | 8 +++++--- .github/workflows/package_c.yml | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index fbbcec40dd..0236418add 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -79,6 +79,7 @@ jobs: DP_PKG_NAME: ${{ matrix.dp_pkg_name }} - uses: actions/upload-artifact@v4 with: + name: cibw-${{ github.job }}-${{ strategy.job-index }} path: ./wheelhouse/*.whl build_sdist: name: Build source distribution @@ -98,6 +99,7 @@ jobs: - uses: actions/upload-artifact@v4 with: + name: sdist path: dist/*.tar.gz upload_pypi: @@ -110,8 +112,8 @@ jobs: steps: - uses: actions/download-artifact@v4 with: - name: artifact path: dist + merge-multiple: true - uses: pypa/gh-action-pypi-publish@release/v1 build_docker: @@ -130,8 +132,8 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v4 with: - name: artifact path: source/install/docker/dist + merge-multiple: true - name: Log in to the Container registry uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d with: @@ -162,8 +164,8 @@ jobs: steps: - uses: actions/download-artifact@v4 with: - name: artifact path: dist/packages + merge-multiple: true - uses: actions/setup-python@v5 name: Install Python with: diff --git a/.github/workflows/package_c.yml b/.github/workflows/package_c.yml index 539494a4f5..4fc8debac3 100644 --- a/.github/workflows/package_c.yml +++ b/.github/workflows/package_c.yml @@ -30,7 +30,7 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v4 with: - name: libdeepmd_c + name: libdeepmd_c-${{ github.job }}-${{ strategy.job-index }} path: ${{ matrix.filename }} - name: Test C library run: ./source/install/docker_test_package_c.sh @@ -48,7 +48,7 @@ jobs: - name: Download artifact uses: actions/download-artifact@v4 with: - name: libdeepmd_c + merge-multiple: true - run: tar -vxzf ./libdeepmd_c.tar.gz - name: Test C library run: ./source/install/build_from_c.sh From a5a6a50522845efabdfdb2e36dec8f3a9be951f6 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Wed, 20 Dec 2023 15:51:04 -0500 Subject: [PATCH 4/4] update name --- .github/workflows/build_wheel.yml | 5 +++-- .github/workflows/package_c.yml | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index 0236418add..40fc036419 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -79,7 +79,7 @@ jobs: DP_PKG_NAME: ${{ matrix.dp_pkg_name }} - uses: actions/upload-artifact@v4 with: - name: cibw-${{ github.job }}-${{ strategy.job-index }} + name: cibw-cp${{ matrix.python }}-${{ matrix.platform_id }}-cu${{ matrix.cuda_version }}-${{ strategy.job-index }} path: ./wheelhouse/*.whl build_sdist: name: Build source distribution @@ -99,7 +99,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: sdist + name: cibw-sdist path: dist/*.tar.gz upload_pypi: @@ -112,6 +112,7 @@ jobs: steps: - uses: actions/download-artifact@v4 with: + pattern: cibw-* path: dist merge-multiple: true - uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/.github/workflows/package_c.yml b/.github/workflows/package_c.yml index 4fc8debac3..5594c79181 100644 --- a/.github/workflows/package_c.yml +++ b/.github/workflows/package_c.yml @@ -30,7 +30,7 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v4 with: - name: libdeepmd_c-${{ github.job }}-${{ strategy.job-index }} + name: libdeepmd_c-${{ strategy.job-index }}-${{ matrix.filename }} path: ${{ matrix.filename }} - name: Test C library run: ./source/install/docker_test_package_c.sh @@ -48,6 +48,7 @@ jobs: - name: Download artifact uses: actions/download-artifact@v4 with: + pattern: libdeepmd_c-* merge-multiple: true - run: tar -vxzf ./libdeepmd_c.tar.gz - name: Test C library