From 7a4ab84a75402867493dc159b2e434da4169025d Mon Sep 17 00:00:00 2001 From: Andre Merzky Date: Wed, 11 Dec 2024 08:48:54 +0100 Subject: [PATCH 1/7] v3 is being retired --- .github/workflows/ci-release.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- .github/workflows/run-rp-notebook.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index 163060f63..a3c0bc2e9 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -17,7 +17,7 @@ jobs: os: [ ubuntu-latest ] python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11' ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 2 - uses: actions/setup-python@v4 @@ -59,7 +59,7 @@ jobs: ../examples/11_task_input_folder.py - name: upload example_artifacts if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: example_artifacts path: example_artifacts diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a7e067d2..a6e8322ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -144,14 +144,14 @@ jobs: fi - name: Upload artifacts if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: artifacts path: artifacts retention-days: 5 - name: Upload sessions if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: sessions_analytics path: sessions_analytics diff --git a/.github/workflows/run-rp-notebook.yml b/.github/workflows/run-rp-notebook.yml index 590e1c4de..c7f18b440 100644 --- a/.github/workflows/run-rp-notebook.yml +++ b/.github/workflows/run-rp-notebook.yml @@ -77,7 +77,7 @@ jobs: fi - name: Upload sessions if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: sessions_notebooks path: sessions_notebooks From 3b351ef95a059534971f9192808403c1e1e006dc Mon Sep 17 00:00:00 2001 From: Andre Merzky Date: Wed, 11 Dec 2024 08:50:41 +0100 Subject: [PATCH 2/7] oops --- .github/workflows/ci-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index a3c0bc2e9..bc6fdbdaf 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -17,7 +17,7 @@ jobs: os: [ ubuntu-latest ] python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11' ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 with: fetch-depth: 2 - uses: actions/setup-python@v4 From 2e3006496b9e6da9b8f67b5cf51be3fdc85bb8d3 Mon Sep 17 00:00:00 2001 From: Andre Merzky Date: Wed, 11 Dec 2024 09:00:47 +0100 Subject: [PATCH 3/7] overwrite --- .github/workflows/ci.yml | 1 + .github/workflows/run-rp-notebook.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6e8322ff..ac4a0d3ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -156,4 +156,5 @@ jobs: name: sessions_analytics path: sessions_analytics retention-days: 5 + overwrite: true diff --git a/.github/workflows/run-rp-notebook.yml b/.github/workflows/run-rp-notebook.yml index c7f18b440..9788502dc 100644 --- a/.github/workflows/run-rp-notebook.yml +++ b/.github/workflows/run-rp-notebook.yml @@ -82,3 +82,4 @@ jobs: name: sessions_notebooks path: sessions_notebooks retention-days: 5 + overwrite: true From 191494da59c1e43802fdb9fc3864b0c23e7f561f Mon Sep 17 00:00:00 2001 From: Andre Merzky Date: Wed, 11 Dec 2024 09:48:27 +0100 Subject: [PATCH 4/7] snap --- .github/workflows/ci-release.yml | 3 ++- .github/workflows/ci.yml | 5 +++-- .github/workflows/run-rp-notebook.yml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index bc6fdbdaf..9e75aab9e 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -61,6 +61,7 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: example_artifacts + name: example_artifacts_${{ matrix.python-version }} path: example_artifacts + overwrite: true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac4a0d3ee..3550383b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -146,14 +146,15 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: artifacts + name: artifacts_${{ matrix.python-version }} path: artifacts retention-days: 5 + overwrite: true - name: Upload sessions if: always() uses: actions/upload-artifact@v4 with: - name: sessions_analytics + name: sessions_analytics_${{ matrix.python-version }} path: sessions_analytics retention-days: 5 overwrite: true diff --git a/.github/workflows/run-rp-notebook.yml b/.github/workflows/run-rp-notebook.yml index 9788502dc..b500f7527 100644 --- a/.github/workflows/run-rp-notebook.yml +++ b/.github/workflows/run-rp-notebook.yml @@ -79,7 +79,7 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: sessions_notebooks + name: sessions_notebooks_${{ inputs.python-version }} path: sessions_notebooks retention-days: 5 overwrite: true From 12899c4862aafb375d2add0d6cc35f0fac5d81ae Mon Sep 17 00:00:00 2001 From: Andre Merzky Date: Wed, 11 Dec 2024 09:54:49 +0100 Subject: [PATCH 5/7] snap --- .github/workflows/run-rp-notebook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-rp-notebook.yml b/.github/workflows/run-rp-notebook.yml index b500f7527..62024baee 100644 --- a/.github/workflows/run-rp-notebook.yml +++ b/.github/workflows/run-rp-notebook.yml @@ -79,7 +79,7 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: sessions_notebooks_${{ inputs.python-version }} + name: sessions_notebooks_${{inputs.notebook-name}} path: sessions_notebooks retention-days: 5 overwrite: true From 1cafa6bb2f72491c52cf0eb68c6ec20aaf78cb6d Mon Sep 17 00:00:00 2001 From: Andre Merzky Date: Wed, 11 Dec 2024 10:01:09 +0100 Subject: [PATCH 6/7] snap --- .github/workflows/run-rp-notebook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-rp-notebook.yml b/.github/workflows/run-rp-notebook.yml index 62024baee..2f146aad2 100644 --- a/.github/workflows/run-rp-notebook.yml +++ b/.github/workflows/run-rp-notebook.yml @@ -79,7 +79,7 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: sessions_notebooks_${{inputs.notebook-name}} + name: sessions_notebooks${{inputs.notebook-name}}_${{inputs.python-version}} path: sessions_notebooks retention-days: 5 overwrite: true From 8f69f494afe1a12137d7549f38572a5fdd6e5ccd Mon Sep 17 00:00:00 2001 From: Andre Merzky Date: Thu, 12 Dec 2024 21:30:46 +0100 Subject: [PATCH 7/7] reduce noise --- .github/workflows/ci.yml | 6 +++--- .github/workflows/run-rp-notebook.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3550383b9..1671ca195 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -135,11 +135,11 @@ jobs: CLIENTNAME="analytics_client_$SIDCLIENT" AGENTNAME="analytics_agent_$SIDCLIENT" mkdir sessions_analytics - # tar cvfj $CLIENTNAME.tar.bz2 $SIDCLIENT - tar cvfj $CLIENTNAME.tar.bz2 `find $SIDCLIENT -type d -print` + # tar cfj $CLIENTNAME.tar.bz2 $SIDCLIENT + tar cfj $CLIENTNAME.tar.bz2 `find $SIDCLIENT -type d -print` cp -R $CLIENTNAME.tar.bz2 sessions_analytics if [ -d "$SIDAGENT" ]; then - tar cvfj $AGENTNAME.tar.bz2 `find $SIDAGENT -type d -print` + tar cfj $AGENTNAME.tar.bz2 `find $SIDAGENT -type d -print` cp -R $AGENTNAME.tar.bz2 sessions_analytics fi - name: Upload artifacts diff --git a/.github/workflows/run-rp-notebook.yml b/.github/workflows/run-rp-notebook.yml index 2f146aad2..e725efc90 100644 --- a/.github/workflows/run-rp-notebook.yml +++ b/.github/workflows/run-rp-notebook.yml @@ -69,10 +69,10 @@ jobs: echo "CLIENTNAME : $CLIENTNAME" echo "AGENTNAME : $AGENTNAME" mkdir sessions_notebooks - tar cvfj $CLIENTNAME.tar.bz2 $SIDCLIENT + tar cfj $CLIENTNAME.tar.bz2 $SIDCLIENT cp -R $CLIENTNAME.tar.bz2 sessions_notebooks if [ -d "$SIDAGENT" ]; then - tar cvfj $AGENTNAME.tar.bz2 $SIDAGENT + tar cfj $AGENTNAME.tar.bz2 $SIDAGENT cp -R $AGENTNAME.tar.bz2 sessions_notebooks fi - name: Upload sessions