Актуализация ветки Dev #2

Merged
Royce59 merged 43 commits from main into dev 2026-02-18 17:08:04 +00:00
3 changed files with 8 additions and 5 deletions
Showing only changes of commit 3f239ed82b - Show all commits

View File

@@ -56,13 +56,14 @@ jobs:
- name: Upload to SSH using scp - name: Upload to SSH using scp
shell: bash shell: bash
run: | run: |
"$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh" \ chmod +x "$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh"
sh "$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh" \
-l "$GITHUB_WORKSPACE/dist/builds/darwin/x64/Rosetta-*.dmg" \ -l "$GITHUB_WORKSPACE/dist/builds/darwin/x64/Rosetta-*.dmg" \
-r "${{ secrets.SSH_TARGET_DIR }}/darwin/x64" \ -r "${{ secrets.SSH_TARGET_DIR }}/darwin/x64" \
-s "${{ secrets.SSH_HOST }}" \ -s "${{ secrets.SSH_HOST }}" \
-u "${{ secrets.SSH_USERNAME }}" \ -u "${{ secrets.SSH_USERNAME }}" \
-p '${{ secrets.SSH_PASSWORD }}' -p '${{ secrets.SSH_PASSWORD }}'
"$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh" \ sh "$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh" \
-l "$GITHUB_WORKSPACE/dist/builds/darwin/arm64/Rosetta-*.dmg" \ -l "$GITHUB_WORKSPACE/dist/builds/darwin/arm64/Rosetta-*.dmg" \
-r "${{ secrets.SSH_TARGET_DIR }}/darwin/arm64" \ -r "${{ secrets.SSH_TARGET_DIR }}/darwin/arm64" \
-s "${{ secrets.SSH_HOST }}" \ -s "${{ secrets.SSH_HOST }}" \

View File

@@ -56,13 +56,14 @@ jobs:
- name: Upload to SSH - name: Upload to SSH
shell: bash shell: bash
run: | run: |
"$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh" \ chmod +x "$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh"
sh "$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh" \
-l "$GITHUB_WORKSPACE/dist/builds/linux/x64/Rosetta-*.AppImage" \ -l "$GITHUB_WORKSPACE/dist/builds/linux/x64/Rosetta-*.AppImage" \
-r "${{ secrets.SSH_TARGET_DIR }}/linux/x64" \ -r "${{ secrets.SSH_TARGET_DIR }}/linux/x64" \
-s "${{ secrets.SSH_HOST }}" \ -s "${{ secrets.SSH_HOST }}" \
-u "${{ secrets.SSH_USERNAME }}" \ -u "${{ secrets.SSH_USERNAME }}" \
-p '${{ secrets.SSH_PASSWORD }}' -p '${{ secrets.SSH_PASSWORD }}'
"$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh" \ sh "$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh" \
-l "$GITHUB_WORKSPACE/dist/builds/linux/arm64/Rosetta-*.AppImage" \ -l "$GITHUB_WORKSPACE/dist/builds/linux/arm64/Rosetta-*.AppImage" \
-r "${{ secrets.SSH_TARGET_DIR }}/linux/arm64" \ -r "${{ secrets.SSH_TARGET_DIR }}/linux/arm64" \
-s "${{ secrets.SSH_HOST }}" \ -s "${{ secrets.SSH_HOST }}" \

View File

@@ -74,7 +74,8 @@ jobs:
- name: Upload to SSH - name: Upload to SSH
shell: bash shell: bash
run: | run: |
"$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh" \ chmod +x "$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh"
sh "$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh" \
-l "$GITHUB_WORKSPACE/packs/*" \ -l "$GITHUB_WORKSPACE/packs/*" \
-r "${{ secrets.SDU_SSH_PACKS }}" \ -r "${{ secrets.SDU_SSH_PACKS }}" \
-s "${{ secrets.SSH_HOST }}" \ -s "${{ secrets.SSH_HOST }}" \