diff --git a/.github/id_ed25519.enc b/.github/id_ed25519.enc new file mode 100644 index 00000000..fa46dcb4 Binary files /dev/null and b/.github/id_ed25519.enc differ diff --git a/.github/id_rsa.enc b/.github/id_rsa.enc deleted file mode 100644 index 024af157..00000000 Binary files a/.github/id_rsa.enc and /dev/null differ diff --git a/.github/workflows/linuxbuild.yml b/.github/workflows/linuxbuild.yml index 52261c2a..36a0e214 100644 --- a/.github/workflows/linuxbuild.yml +++ b/.github/workflows/linuxbuild.yml @@ -23,6 +23,6 @@ jobs: run: TRAVIS_OS_NAME=linux travis/build.sh - name: Upload for Linux env: - gh_rsa_key: ${{ secrets.GH_ENCRYPTED_RSA_KEY }} - gh_rsa_iv: ${{ secrets.GH_ENCRYPTED_RSA_IV }} + gh_ed25519_key: ${{ secrets.GH_ENCRYPTED_ED25519_KEY }} + gh_ed25519_iv: ${{ secrets.GH_ENCRYPTED_ED25519_IV }} run: TRAVIS_OS_NAME=linux travis/upload.sh diff --git a/travis/upload.sh b/travis/upload.sh index 573e168d..b8a2e6b6 100755 --- a/travis/upload.sh +++ b/travis/upload.sh @@ -2,18 +2,16 @@ echo Decrypting id_rsa... mkdir -p sshconfig -if [ ! -z $gh_rsa_key ]; then - openssl aes-256-cbc -K $gh_rsa_key -iv $gh_rsa_iv -in .github/id_rsa.enc -out sshconfig/id_rsa -d || exit 1 -elif [ ! -z $encrypted_b1899526f957_key ]; then - openssl aes-256-cbc -K $encrypted_b1899526f957_key -iv $encrypted_b1899526f957_iv -in travis/id_rsa.enc -out sshconfig/id_rsa -d || exit 1 +if [ ! -z $gh_ed25519_key ]; then + openssl aes-256-cbc -K $gh_ed25519_key -iv $gh_ed25519_iv -in .github/id_ed25519.enc -out sshconfig/id_ed25519 -d || exit 1 else echo "SSH key is not available, upload cancelled" exit 0 fi eval "$(ssh-agent -s)" -chmod 600 sshconfig/id_rsa -ssh-add sshconfig/id_rsa || exit 1 +chmod 600 sshconfig/id_ed25519 +ssh-add sshconfig/id_ed25519 || exit 1 SSHOPTS="ssh -o StrictHostKeyChecking=no"