From 23b980adfcac1698ddb46a5be1ac38fcacd08d99 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 18 Jun 2025 08:57:49 +0200 Subject: [PATCH 01/17] ci: add workflow for SSH credential checks --- .github/workflows/build-and-test.yml | 2 +- .github/workflows/publish-snapshot.yml | 2 +- .github/workflows/test-ssh.yml | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/test-ssh.yml diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index c52d6b2..84a541c 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -2,7 +2,7 @@ name: Build and Test on: pull_request: - branches: [main] + branches: [main_no] jobs: build-and-test: diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index b55eca4..7edb1d6 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -2,7 +2,7 @@ name: Publish Snapshot package on: push: - branches: [main] + branches: [main_no] jobs: publish-snapshot: diff --git a/.github/workflows/test-ssh.yml b/.github/workflows/test-ssh.yml new file mode 100644 index 0000000..cf5e330 --- /dev/null +++ b/.github/workflows/test-ssh.yml @@ -0,0 +1,26 @@ +name: Check SSH credentials + +on: + pull_request: + branches: [main] + +jobs: + check-ssh: + runs-on: ubuntu-latest + steps: + - name: Set up SSH key + shell: bash + run: | + mkdir -p ~/.ssh + echo "${{ inputs.ssh-private-key }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + eval $(ssh-agent) + echo "$SSH_PASSPHRASE" | SSH_ASKPASS=/bin/false ssh-add ~/.ssh/id_rsa + ssh-keyscan projects-storage.eclipse.org >> ~/.ssh/known_hosts + env: + SSH_PASSPHRASE: ${{ inputs.ssh-passphrase }} + + - name: Check ssh credentials + shell: bash + run: | + ssh genie.keypop@projects-storage.eclipse.org "test -d /home/data/httpd/download.eclipse.org/keypop && echo 'Access OK'" From b55079c5681250913bdced18ed46d2e20d118afc Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 18 Jun 2025 09:03:00 +0200 Subject: [PATCH 02/17] ci: update workflow to use secrets for SSH keys --- .github/workflows/test-ssh.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-ssh.yml b/.github/workflows/test-ssh.yml index cf5e330..4f58350 100644 --- a/.github/workflows/test-ssh.yml +++ b/.github/workflows/test-ssh.yml @@ -12,13 +12,13 @@ jobs: shell: bash run: | mkdir -p ~/.ssh - echo "${{ inputs.ssh-private-key }}" > ~/.ssh/id_rsa + echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa eval $(ssh-agent) echo "$SSH_PASSPHRASE" | SSH_ASKPASS=/bin/false ssh-add ~/.ssh/id_rsa ssh-keyscan projects-storage.eclipse.org >> ~/.ssh/known_hosts env: - SSH_PASSPHRASE: ${{ inputs.ssh-passphrase }} + SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }} - name: Check ssh credentials shell: bash From 04883c27499890e6cf0385e9601c70375bec52cb Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 18 Jun 2025 09:07:32 +0200 Subject: [PATCH 03/17] ci: remove SSH passphrase and enforce strict host checks --- .github/workflows/test-ssh.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-ssh.yml b/.github/workflows/test-ssh.yml index 4f58350..35930bf 100644 --- a/.github/workflows/test-ssh.yml +++ b/.github/workflows/test-ssh.yml @@ -15,12 +15,10 @@ jobs: echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa eval $(ssh-agent) - echo "$SSH_PASSPHRASE" | SSH_ASKPASS=/bin/false ssh-add ~/.ssh/id_rsa + ssh-add ~/.ssh/id_rsa ssh-keyscan projects-storage.eclipse.org >> ~/.ssh/known_hosts - env: - SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }} - name: Check ssh credentials shell: bash run: | - ssh genie.keypop@projects-storage.eclipse.org "test -d /home/data/httpd/download.eclipse.org/keypop && echo 'Access OK'" + ssh -o StrictHostKeyChecking=yes genie.keypop@projects-storage.eclipse.org "test -d /home/data/httpd/download.eclipse.org/keypop && echo 'Access OK'" From 14eb00d2f1904e54d2fab3af0cb7ca3885c7ff03 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 18 Jun 2025 09:10:08 +0200 Subject: [PATCH 04/17] ci: improve SSH setup with debugging and error handling --- .github/workflows/test-ssh.yml | 39 ++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-ssh.yml b/.github/workflows/test-ssh.yml index 35930bf..cd0c9aa 100644 --- a/.github/workflows/test-ssh.yml +++ b/.github/workflows/test-ssh.yml @@ -8,17 +8,44 @@ jobs: check-ssh: runs-on: ubuntu-latest steps: - - name: Set up SSH key + - name: Set up SSH key and debug shell: bash run: | + echo "🔐 Setting up SSH directory" mkdir -p ~/.ssh + chmod 700 ~/.ssh + + echo "🔐 Writing SSH private key" echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa - eval $(ssh-agent) - ssh-add ~/.ssh/id_rsa - ssh-keyscan projects-storage.eclipse.org >> ~/.ssh/known_hosts - - name: Check ssh credentials + echo "🔐 Starting ssh-agent" + eval "$(ssh-agent -s)" + + echo "🔐 Adding SSH key with ssh-add" + echo "Note: ssh-add will fail if the key requires a passphrase and no agent interaction is possible." + + # Try with SSH_ASKPASS fallback to echo for debugging (non-interactive env) + export DISPLAY=:0 + SSH_ASKPASS="$(which echo)" SSH_ASKPASS_REQUIRE=force ssh-add ~/.ssh/id_rsa || { + echo "❌ ssh-add failed — likely due to passphrase. Try using an unencrypted key or configure SSH agent forwarding." + exit 1 + } + + echo "✅ ssh-add succeeded" + + echo "🔐 Known hosts setup" + ssh-keyscan -H projects-storage.eclipse.org >> ~/.ssh/known_hosts + + echo "🔐 SSH config (optional)" + echo -e "Host projects-storage.eclipse.org\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config + chmod 600 ~/.ssh/config + + - name: Check SSH connectivity shell: bash run: | - ssh -o StrictHostKeyChecking=yes genie.keypop@projects-storage.eclipse.org "test -d /home/data/httpd/download.eclipse.org/keypop && echo 'Access OK'" + echo "🔗 Testing SSH connection..." + ssh -v genie.keypop@projects-storage.eclipse.org "echo '✅ SSH connection successful'" || { + echo "❌ SSH connection failed" + exit 1 + } From a87f8f31b5f59a537b2524583cf0cd6ea2f9c4dd Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 18 Jun 2025 09:18:35 +0200 Subject: [PATCH 05/17] ci: enhance SSH setup with passphrase automation --- .github/workflows/test-ssh.yml | 52 +++++++++++++++------------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/.github/workflows/test-ssh.yml b/.github/workflows/test-ssh.yml index cd0c9aa..a0ec06b 100644 --- a/.github/workflows/test-ssh.yml +++ b/.github/workflows/test-ssh.yml @@ -7,45 +7,39 @@ on: jobs: check-ssh: runs-on: ubuntu-latest + steps: - - name: Set up SSH key and debug + - name: 🔐 Set up SSH key with passphrase shell: bash run: | echo "🔐 Setting up SSH directory" mkdir -p ~/.ssh - chmod 700 ~/.ssh - + echo "🔐 Writing SSH private key" echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa - + echo "🔐 Starting ssh-agent" eval "$(ssh-agent -s)" - echo "🔐 Adding SSH key with ssh-add" - echo "Note: ssh-add will fail if the key requires a passphrase and no agent interaction is possible." - - # Try with SSH_ASKPASS fallback to echo for debugging (non-interactive env) - export DISPLAY=:0 - SSH_ASKPASS="$(which echo)" SSH_ASKPASS_REQUIRE=force ssh-add ~/.ssh/id_rsa || { - echo "❌ ssh-add failed — likely due to passphrase. Try using an unencrypted key or configure SSH agent forwarding." - exit 1 - } - - echo "✅ ssh-add succeeded" - - echo "🔐 Known hosts setup" - ssh-keyscan -H projects-storage.eclipse.org >> ~/.ssh/known_hosts - - echo "🔐 SSH config (optional)" - echo -e "Host projects-storage.eclipse.org\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config - chmod 600 ~/.ssh/config - - - name: Check SSH connectivity + echo "🔐 Installing 'expect' to simulate passphrase entry" + sudo apt-get update -qq + sudo apt-get install -y expect + + echo "🔐 Adding SSH key with passphrase using expect" + expect <> ~/.ssh/known_hosts + + - name: ✅ Check SSH credentials shell: bash run: | - echo "🔗 Testing SSH connection..." - ssh -v genie.keypop@projects-storage.eclipse.org "echo '✅ SSH connection successful'" || { - echo "❌ SSH connection failed" - exit 1 - } + echo "🔍 Testing SSH access..." + ssh -o StrictHostKeyChecking=yes genie.keypop@projects-storage.eclipse.org \ + "test -d /home/data/httpd/download.eclipse.org/keypop && echo '✅ Access OK' || echo '❌ Access Denied'" From 23607368045e7fa1ec75091829ef559a48d3bf6b Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 18 Jun 2025 09:23:17 +0200 Subject: [PATCH 06/17] ci: refine SSH deploy process with improved setup --- .github/workflows/test-ssh.yml | 52 ++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/.github/workflows/test-ssh.yml b/.github/workflows/test-ssh.yml index a0ec06b..558229f 100644 --- a/.github/workflows/test-ssh.yml +++ b/.github/workflows/test-ssh.yml @@ -5,41 +5,43 @@ on: branches: [main] jobs: - check-ssh: + deploy: runs-on: ubuntu-latest steps: - - name: 🔐 Set up SSH key with passphrase - shell: bash + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up SSH + env: + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }} + SSH_USERNAME: ${{ secrets.SSH_USERNAME }} run: | - echo "🔐 Setting up SSH directory" - mkdir -p ~/.ssh + # Start the ssh-agent + eval $(ssh-agent -s) - echo "🔐 Writing SSH private key" - echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - - echo "🔐 Starting ssh-agent" - eval "$(ssh-agent -s)" - - echo "🔐 Installing 'expect' to simulate passphrase entry" - sudo apt-get update -qq - sudo apt-get install -y expect - - echo "🔐 Adding SSH key with passphrase using expect" - expect < add_key.sh + #!/usr/bin/expect -f + spawn ssh-add - + expect "Enter passphrase for /dev/stdin:" + send "\$env(SSH_PASSPHRASE)\r" + expect eof EOF - - echo "🔐 Adding known host for projects-storage.eclipse.org" + chmod +x add_key.sh + + # Add the private key to the ssh-agent + echo "$SSH_PRIVATE_KEY" | ./add_key.sh + + # Optional: Add the server's host key to known_hosts to avoid interactive prompts + mkdir -p ~/.ssh ssh-keyscan projects-storage.eclipse.org >> ~/.ssh/known_hosts + chmod 644 ~/.ssh/known_hosts - name: ✅ Check SSH credentials shell: bash run: | echo "🔍 Testing SSH access..." - ssh -o StrictHostKeyChecking=yes genie.keypop@projects-storage.eclipse.org \ + ssh -o StrictHostKeyChecking=yes $env(SSH_USERNAME)@projects-storage.eclipse.org \ "test -d /home/data/httpd/download.eclipse.org/keypop && echo '✅ Access OK' || echo '❌ Access Denied'" From d5481b4d34888b905dff5f8fb6df148fa835f0c7 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 18 Jun 2025 09:25:33 +0200 Subject: [PATCH 07/17] ci: simplify SSH setup in workflow configuration --- .github/workflows/test-ssh.yml | 43 +++++++++------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/.github/workflows/test-ssh.yml b/.github/workflows/test-ssh.yml index 558229f..05db51f 100644 --- a/.github/workflows/test-ssh.yml +++ b/.github/workflows/test-ssh.yml @@ -5,43 +5,22 @@ on: branches: [main] jobs: - deploy: + check-ssh: runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up SSH - env: - SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} - SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }} - SSH_USERNAME: ${{ secrets.SSH_USERNAME }} + - name: Set up SSH key + shell: bash run: | - # Start the ssh-agent - eval $(ssh-agent -s) - - # Create a temporary file for the expect script - cat < add_key.sh - #!/usr/bin/expect -f - spawn ssh-add - - expect "Enter passphrase for /dev/stdin:" - send "\$env(SSH_PASSPHRASE)\r" - expect eof - EOF - chmod +x add_key.sh - - # Add the private key to the ssh-agent - echo "$SSH_PRIVATE_KEY" | ./add_key.sh - - # Optional: Add the server's host key to known_hosts to avoid interactive prompts mkdir -p ~/.ssh + echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + eval $(ssh-agent) + echo "$SSH_PASSPHRASE" | SSH_ASKPASS=/bin/false ssh-add ~/.ssh/id_rsa ssh-keyscan projects-storage.eclipse.org >> ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts + env: + SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }} - - name: ✅ Check SSH credentials + - name: Check ssh credentials shell: bash run: | - echo "🔍 Testing SSH access..." - ssh -o StrictHostKeyChecking=yes $env(SSH_USERNAME)@projects-storage.eclipse.org \ - "test -d /home/data/httpd/download.eclipse.org/keypop && echo '✅ Access OK' || echo '❌ Access Denied'" + ssh ${{ secrets.SSH_USERNAME }}@projects-storage.eclipse.org "test -d /home/data/httpd/download.eclipse.org/keypop && echo 'Access OK'" From 2f5a5ba971548e49c16a7c4edf65c28d762e07e9 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 18 Jun 2025 09:32:22 +0200 Subject: [PATCH 08/17] ci: add SSH username in workflow --- .github/workflows/test-ssh.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-ssh.yml b/.github/workflows/test-ssh.yml index 05db51f..bb1a035 100644 --- a/.github/workflows/test-ssh.yml +++ b/.github/workflows/test-ssh.yml @@ -17,6 +17,7 @@ jobs: eval $(ssh-agent) echo "$SSH_PASSPHRASE" | SSH_ASKPASS=/bin/false ssh-add ~/.ssh/id_rsa ssh-keyscan projects-storage.eclipse.org >> ~/.ssh/known_hosts + echo "C:${{ secrets.SSH_USERNAME }}" | sed 's/./&X/g' env: SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }} From 5c2bd8968f219b4119d44235093db925ee0187b4 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 18 Jun 2025 09:47:30 +0200 Subject: [PATCH 09/17] ci: enable verbose SSH logs for debugging in workflow --- .github/workflows/test-ssh.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test-ssh.yml b/.github/workflows/test-ssh.yml index bb1a035..b8b92de 100644 --- a/.github/workflows/test-ssh.yml +++ b/.github/workflows/test-ssh.yml @@ -17,11 +17,10 @@ jobs: eval $(ssh-agent) echo "$SSH_PASSPHRASE" | SSH_ASKPASS=/bin/false ssh-add ~/.ssh/id_rsa ssh-keyscan projects-storage.eclipse.org >> ~/.ssh/known_hosts - echo "C:${{ secrets.SSH_USERNAME }}" | sed 's/./&X/g' env: SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }} - name: Check ssh credentials shell: bash run: | - ssh ${{ secrets.SSH_USERNAME }}@projects-storage.eclipse.org "test -d /home/data/httpd/download.eclipse.org/keypop && echo 'Access OK'" + ssh -vvv ${{ secrets.SSH_USERNAME }}@projects-storage.eclipse.org "test -d /home/data/httpd/download.eclipse.org/keypop && echo 'Access OK'" From 31d2c4fb6b82e28fb387f36a632ff3564cc9424a Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 18 Jun 2025 09:59:25 +0200 Subject: [PATCH 10/17] ci: update SSH workflow with expect for passphrase handling --- .github/workflows/test-ssh.yml | 35 +++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test-ssh.yml b/.github/workflows/test-ssh.yml index b8b92de..f1dbb95 100644 --- a/.github/workflows/test-ssh.yml +++ b/.github/workflows/test-ssh.yml @@ -5,22 +5,31 @@ on: branches: [main] jobs: - check-ssh: + test-ssh: runs-on: ubuntu-latest steps: - - name: Set up SSH key - shell: bash - run: | - mkdir -p ~/.ssh - echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - eval $(ssh-agent) - echo "$SSH_PASSPHRASE" | SSH_ASKPASS=/bin/false ssh-add ~/.ssh/id_rsa - ssh-keyscan projects-storage.eclipse.org >> ~/.ssh/known_hosts + - name: Install expect + run: sudo apt-get update && sudo apt-get install -y expect + + - name: Start ssh-agent + run: eval "$(ssh-agent -s)" + + - name: Add SSH key with passphrase env: SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }} + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + run: | + echo "$SSH_PRIVATE_KEY" > id_rsa + chmod 600 id_rsa + + expect << EOF + spawn ssh-add id_rsa + expect "Enter passphrase" + send "$env(SSH_PASSPHRASE)\r" + expect eof + EOF - - name: Check ssh credentials - shell: bash + - name: Test SSH connection run: | - ssh -vvv ${{ secrets.SSH_USERNAME }}@projects-storage.eclipse.org "test -d /home/data/httpd/download.eclipse.org/keypop && echo 'Access OK'" + ssh -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@projects-storage.eclipse.org \ + "test -d /home/data/httpd/download.eclipse.org/keypop && echo 'Access OK'" From 32e61564e86fca7906dd6dd8b53663aaf8b521ca Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 18 Jun 2025 10:09:25 +0200 Subject: [PATCH 11/17] ci: refine SSH workflow with streamlined setup --- .github/workflows/test-ssh.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test-ssh.yml b/.github/workflows/test-ssh.yml index f1dbb95..0461fc2 100644 --- a/.github/workflows/test-ssh.yml +++ b/.github/workflows/test-ssh.yml @@ -8,28 +8,29 @@ jobs: test-ssh: runs-on: ubuntu-latest steps: - - name: Install expect - run: sudo apt-get update && sudo apt-get install -y expect - - - name: Start ssh-agent - run: eval "$(ssh-agent -s)" - - - name: Add SSH key with passphrase + - name: Configure and check SSH env: SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }} SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + SSH_USER: ${{ secrets.SSH_USER }} run: | + sudo apt-get update && sudo apt-get install -y expect + + eval "$(ssh-agent -s)" + echo "$SSH_PRIVATE_KEY" > id_rsa chmod 600 id_rsa expect << EOF spawn ssh-add id_rsa expect "Enter passphrase" - send "$env(SSH_PASSPHRASE)\r" + send "$SSH_PASSPHRASE\r" expect eof EOF - - name: Test SSH connection - run: | - ssh -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@projects-storage.eclipse.org \ - "test -d /home/data/httpd/download.eclipse.org/keypop && echo 'Access OK'" + echo "Key added to agent :" + ssh-add -l + + echo "SSH connection test..." + ssh -o StrictHostKeyChecking=no $SSH_USER@projects-storage.eclipse.org \ + "test -d /home/data/httpd/download.eclipse.org/keypop && echo 'Access OK, the directory exists.'" \ No newline at end of file From 5560edd6a846c0c5fd25f8514df17efab75cb178 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 18 Jun 2025 10:14:21 +0200 Subject: [PATCH 12/17] ci: update SSH username variable in workflow --- .github/workflows/test-ssh.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-ssh.yml b/.github/workflows/test-ssh.yml index 0461fc2..4499506 100644 --- a/.github/workflows/test-ssh.yml +++ b/.github/workflows/test-ssh.yml @@ -12,10 +12,8 @@ jobs: env: SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }} SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} - SSH_USER: ${{ secrets.SSH_USER }} + SSH_USERNAME: ${{ secrets.SSH_USERNAME }} run: | - sudo apt-get update && sudo apt-get install -y expect - eval "$(ssh-agent -s)" echo "$SSH_PRIVATE_KEY" > id_rsa @@ -32,5 +30,5 @@ jobs: ssh-add -l echo "SSH connection test..." - ssh -o StrictHostKeyChecking=no $SSH_USER@projects-storage.eclipse.org \ + ssh -o StrictHostKeyChecking=no SSH_USERNAME@projects-storage.eclipse.org \ "test -d /home/data/httpd/download.eclipse.org/keypop && echo 'Access OK, the directory exists.'" \ No newline at end of file From 4830a1ad766f9bae8776af9b10dc5740bc529716 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 18 Jun 2025 10:17:00 +0200 Subject: [PATCH 13/17] ci: install expect package in SSH workflow --- .github/workflows/test-ssh.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test-ssh.yml b/.github/workflows/test-ssh.yml index 4499506..169591a 100644 --- a/.github/workflows/test-ssh.yml +++ b/.github/workflows/test-ssh.yml @@ -14,6 +14,8 @@ jobs: SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} SSH_USERNAME: ${{ secrets.SSH_USERNAME }} run: | + sudo apt-get update && sudo apt-get install -y expect + eval "$(ssh-agent -s)" echo "$SSH_PRIVATE_KEY" > id_rsa From 7fa0fdb01b68ff2e579259ad03e0e90f41335d21 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 18 Jun 2025 10:21:06 +0200 Subject: [PATCH 14/17] ci: enable verbose logging in SSH connection test --- .github/workflows/test-ssh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-ssh.yml b/.github/workflows/test-ssh.yml index 169591a..2f383a1 100644 --- a/.github/workflows/test-ssh.yml +++ b/.github/workflows/test-ssh.yml @@ -32,5 +32,5 @@ jobs: ssh-add -l echo "SSH connection test..." - ssh -o StrictHostKeyChecking=no SSH_USERNAME@projects-storage.eclipse.org \ + ssh -vvv -o StrictHostKeyChecking=no SSH_USERNAME@projects-storage.eclipse.org \ "test -d /home/data/httpd/download.eclipse.org/keypop && echo 'Access OK, the directory exists.'" \ No newline at end of file From 853ad6a4a16ef11e2e0cb7bb283b0672f5625703 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 18 Jun 2025 10:24:22 +0200 Subject: [PATCH 15/17] ci: fix variable usage in SSH connection test --- .github/workflows/test-ssh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-ssh.yml b/.github/workflows/test-ssh.yml index 2f383a1..75cbcf3 100644 --- a/.github/workflows/test-ssh.yml +++ b/.github/workflows/test-ssh.yml @@ -32,5 +32,5 @@ jobs: ssh-add -l echo "SSH connection test..." - ssh -vvv -o StrictHostKeyChecking=no SSH_USERNAME@projects-storage.eclipse.org \ + ssh -vvv -o StrictHostKeyChecking=no $SSH_USERNAME@projects-storage.eclipse.org \ "test -d /home/data/httpd/download.eclipse.org/keypop && echo 'Access OK, the directory exists.'" \ No newline at end of file From db8781bb41227c6ea0c158874b0388939b66040f Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 18 Jun 2025 11:01:35 +0200 Subject: [PATCH 16/17] ci: update branch trigger in workflows --- .github/workflows/build-and-test.yml | 2 +- .github/workflows/publish-snapshot.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 84a541c..c52d6b2 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -2,7 +2,7 @@ name: Build and Test on: pull_request: - branches: [main_no] + branches: [main] jobs: build-and-test: diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index 7edb1d6..b55eca4 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -2,7 +2,7 @@ name: Publish Snapshot package on: push: - branches: [main_no] + branches: [main] jobs: publish-snapshot: From 14e34c942d03910330822bb26ed168f5f83b3c9f Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 18 Jun 2025 11:48:53 +0200 Subject: [PATCH 17/17] ci: remove SSH workflow configuration --- .github/workflows/test-ssh.yml | 36 ---------------------------------- 1 file changed, 36 deletions(-) delete mode 100644 .github/workflows/test-ssh.yml diff --git a/.github/workflows/test-ssh.yml b/.github/workflows/test-ssh.yml deleted file mode 100644 index 75cbcf3..0000000 --- a/.github/workflows/test-ssh.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Check SSH credentials - -on: - pull_request: - branches: [main] - -jobs: - test-ssh: - runs-on: ubuntu-latest - steps: - - name: Configure and check SSH - env: - SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }} - SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} - SSH_USERNAME: ${{ secrets.SSH_USERNAME }} - run: | - sudo apt-get update && sudo apt-get install -y expect - - eval "$(ssh-agent -s)" - - echo "$SSH_PRIVATE_KEY" > id_rsa - chmod 600 id_rsa - - expect << EOF - spawn ssh-add id_rsa - expect "Enter passphrase" - send "$SSH_PASSPHRASE\r" - expect eof - EOF - - echo "Key added to agent :" - ssh-add -l - - echo "SSH connection test..." - ssh -vvv -o StrictHostKeyChecking=no $SSH_USERNAME@projects-storage.eclipse.org \ - "test -d /home/data/httpd/download.eclipse.org/keypop && echo 'Access OK, the directory exists.'" \ No newline at end of file