From f5138ba1858dbc60bee7c5a30705fcecd59a0d27 Mon Sep 17 00:00:00 2001 From: Dax Pryce Date: Tue, 15 Oct 2024 14:25:03 -0700 Subject: [PATCH 1/4] Update push-test.yml When the upload-artifact action was updated to v4, the behavior of it changes such that you cannot create a unified "artifact" by having it add files to an existing artifact name. Instead, they all require a unique artifact name to be uploaded. This should fix the current workflow build errors. --- .github/workflows/push-test.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/push-test.yml b/.github/workflows/push-test.yml index f9d63ca89..d1261d5ff 100644 --- a/.github/workflows/push-test.yml +++ b/.github/workflows/push-test.yml @@ -35,19 +35,16 @@ jobs: with: fetch-depth: 1 submodules: true - - name: Build dispannpy dependency tree + - name: Build diskannpy dependency tree run: | pip install diskannpy pipdeptree echo "dependencies" > dependencies_${{ matrix.os }}.txt pipdeptree >> dependencies_${{ matrix.os }}.txt - - name: Archive dispannpy dependencies artifact + - name: Archive diskannpy dependencies artifact uses: actions/upload-artifact@v4 with: - name: dependencies + name: dependencies_${{ matrix.os }} path: | dependencies_${{ matrix.os }}.txt - name: DiskANN Build CLI Applications uses: ./.github/actions/build -# python: -# name: DiskANN Build Python Wheel -# uses: ./.github/workflows/build-python.yml From 75caf6a162266b93eaf15c9ff10d1f073f754ab3 Mon Sep 17 00:00:00 2001 From: Dax Pryce Date: Wed, 16 Oct 2024 20:27:16 +0000 Subject: [PATCH 2/4] Trying to fix the workflow to handle the name collision problem that starts in upload-artifact@v4 --- .github/workflows/disk-pq.yml | 2 +- .github/workflows/dynamic-labels.yml | 2 +- .github/workflows/dynamic.yml | 2 +- .github/workflows/in-mem-no-pq.yml | 2 +- .github/workflows/in-mem-pq.yml | 2 +- .github/workflows/labels.yml | 2 +- .github/workflows/multi-sector-disk-pq.yml | 2 +- .github/workflows/perf.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/disk-pq.yml b/.github/workflows/disk-pq.yml index f30f1483b..930d21360 100644 --- a/.github/workflows/disk-pq.yml +++ b/.github/workflows/disk-pq.yml @@ -111,7 +111,7 @@ jobs: - name: upload data and bin uses: actions/upload-artifact@v4 with: - name: disk-pq + name: disk-pq-${{matrix.os}} path: | ./dist/** ./data/** diff --git a/.github/workflows/dynamic-labels.yml b/.github/workflows/dynamic-labels.yml index 43cb6e6bd..4a0c68b3f 100644 --- a/.github/workflows/dynamic-labels.yml +++ b/.github/workflows/dynamic-labels.yml @@ -96,7 +96,7 @@ jobs: - name: upload data and bin uses: actions/upload-artifact@v4 with: - name: dynamic + name: dynamic-${{matrix.os}} path: | ./dist/** ./data/** diff --git a/.github/workflows/dynamic.yml b/.github/workflows/dynamic.yml index 5be88ddf5..edd691ef7 100644 --- a/.github/workflows/dynamic.yml +++ b/.github/workflows/dynamic.yml @@ -69,7 +69,7 @@ jobs: - name: upload data and bin uses: actions/upload-artifact@v4 with: - name: dynamic + name: dynamic-${{matrix.os}} path: | ./dist/** ./data/** diff --git a/.github/workflows/in-mem-no-pq.yml b/.github/workflows/in-mem-no-pq.yml index 84263e1d5..07fc4a287 100644 --- a/.github/workflows/in-mem-no-pq.yml +++ b/.github/workflows/in-mem-no-pq.yml @@ -75,7 +75,7 @@ jobs: - name: upload data and bin uses: actions/upload-artifact@v4 with: - name: in-memory-no-pq + name: in-memory-no-pq-${{matrix.os}} path: | ./dist/** ./data/** diff --git a/.github/workflows/in-mem-pq.yml b/.github/workflows/in-mem-pq.yml index 8726d2c65..be20f10b6 100644 --- a/.github/workflows/in-mem-pq.yml +++ b/.github/workflows/in-mem-pq.yml @@ -50,7 +50,7 @@ jobs: - name: upload data and bin uses: actions/upload-artifact@v4 with: - name: in-memory-pq + name: in-memory-pq-${{matrix.os}} path: | ./dist/** ./data/** \ No newline at end of file diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index e08a1571e..4c3fb06b7 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -113,7 +113,7 @@ jobs: - name: upload data and bin uses: actions/upload-artifact@v4 with: - name: labels + name: labels-${{matrix.os}} path: | ./dist/** ./data/** diff --git a/.github/workflows/multi-sector-disk-pq.yml b/.github/workflows/multi-sector-disk-pq.yml index 391d80d64..969467ab0 100644 --- a/.github/workflows/multi-sector-disk-pq.yml +++ b/.github/workflows/multi-sector-disk-pq.yml @@ -54,7 +54,7 @@ jobs: - name: upload data and bin uses: actions/upload-artifact@v4 with: - name: multi-sector-disk-pq + name: multi-sector-disk-pq-${{matrix.os}} path: | ./dist/** ./data/** diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index b399b70cb..d4eb9e237 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -21,6 +21,6 @@ jobs: - name: Upload Metrics Logs uses: actions/upload-artifact@v4 with: - name: metrics + name: metrics-${{matrix.os}} path: | ./metrics/** From 3a5b672eb82578e1150cb7f9cc9d46251253a27a Mon Sep 17 00:00:00 2001 From: Dax Pryce Date: Wed, 16 Oct 2024 20:37:46 +0000 Subject: [PATCH 3/4] Trying to get the cibuildwheel tool to work with the changes to AlmaLinux8 (why the heck is this docker image still shipping with an old gpg key anyway) --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index f6a39cfe7..e59556e67 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,6 +47,7 @@ test-command = "python -m unittest discover {project}/python/tests" [tool.cibuildwheel.linux] before-build = [ + "rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux", "dnf makecache --refresh", "dnf upgrade -y almalinux-release", "dnf install -y epel-release", From 198078014996f5fa0da157ba3d383b482f48a575 Mon Sep 17 00:00:00 2001 From: Dax Pryce Date: Wed, 16 Oct 2024 20:54:05 +0000 Subject: [PATCH 4/4] Dynamic and Dynamic Labels were both trying to write to the artifact --- .github/workflows/dynamic-labels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dynamic-labels.yml b/.github/workflows/dynamic-labels.yml index 4a0c68b3f..d5dc7122b 100644 --- a/.github/workflows/dynamic-labels.yml +++ b/.github/workflows/dynamic-labels.yml @@ -96,7 +96,7 @@ jobs: - name: upload data and bin uses: actions/upload-artifact@v4 with: - name: dynamic-${{matrix.os}} + name: dynamic-labels-${{matrix.os}} path: | ./dist/** ./data/**