From a3ade33295613916d4e0bc762b3b2d6bb2d5d305 Mon Sep 17 00:00:00 2001 From: Kyle Bloom Date: Thu, 21 Apr 2022 17:33:32 +0100 Subject: [PATCH] Change binary store (#7156) * Update azure pipelines * Update mac and pi jobs * Remove unnessesary workflows * test pi's * Update change log * Fix local file location * Remove pull_request trigger --- .github/workflows/aws-upload-linux-centos.yml | 58 --------------- .github/workflows/aws-upload-linux-debian.yml | 55 -------------- .github/workflows/aws-upload-linux-fedora.yml | 55 -------------- .github/workflows/aws-upload-linux-ubuntu.yml | 58 --------------- .github/workflows/aws-upload-mac.yml | 67 ----------------- .github/workflows/aws-upload-raspberry.yml | 47 ------------ .github/workflows/aws-upload-windows.yml | 72 ------------------- .github/workflows/job-build-mac-10.13.yaml | 30 ++++---- .github/workflows/job-build-mac-m1.yaml | 24 +++---- .github/workflows/job-build-raspberry-pi.yaml | 18 ++--- CI/Linux/linux-build.yml | 12 ++-- CI/MacOS/mac-build.yml | 6 +- CI/Windows/windows-build.yml | 18 ++--- ChangeLog | 1 + 14 files changed, 51 insertions(+), 470 deletions(-) delete mode 100644 .github/workflows/aws-upload-linux-centos.yml delete mode 100644 .github/workflows/aws-upload-linux-debian.yml delete mode 100644 .github/workflows/aws-upload-linux-fedora.yml delete mode 100644 .github/workflows/aws-upload-linux-ubuntu.yml delete mode 100644 .github/workflows/aws-upload-mac.yml delete mode 100644 .github/workflows/aws-upload-raspberry.yml delete mode 100644 .github/workflows/aws-upload-windows.yml diff --git a/.github/workflows/aws-upload-linux-centos.yml b/.github/workflows/aws-upload-linux-centos.yml deleted file mode 100644 index 565d9a5a37..0000000000 --- a/.github/workflows/aws-upload-linux-centos.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: CentOS - Core - -on: - release: - types: [published] - # pull_request: - -jobs: - build-core-centos: - runs-on: ubuntu-latest - container: symless/synergy-vcpkg:${{ matrix.distro }} - env: - GIT_COMMIT: ${{ github.sha }} - SYNERGY_NO_LEGACY: "1" - SYNERGY_NO_TESTS: "1" - SYNERGY_STATIC_OPENSSL: "1" - VCPKG_LIBRARY_LINKAGE: "static" - defaults: - run: - shell: bash - strategy: - matrix: - distro: - # - centos7.6 - - centos8 - - name: ${{ matrix.distro }} - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - mkdir build - cd build - cmake3 \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX:PATH=$(pwd)/rpm/BUILDROOT/usr \ - -DCMAKE_TOOLCHAIN_FILE=${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake \ - .. - . ./version - make -j - - - uses: shallwefootball/s3-upload-action@master - if: "github.event_name == 'release'" - with: - aws_key_id: ${{ secrets.AWS_S3_UPLOAD_KEY_ID }} - aws_secret_access_key: ${{ secrets.AWS_S3_UPLOAD_SECRET }} - aws_bucket: ${{ secrets.AWS_BUCKET }} - source_dir: ./build/bin - destination_dir: "./synergy3/latest/${{matrix.distro}}/" - - - uses: actions/upload-artifact@v2 - if: "github.event_name == 'pull_request'" - with: - name: ${{ matrix.distro }} - path: build/bin/* - retention-days: 1 diff --git a/.github/workflows/aws-upload-linux-debian.yml b/.github/workflows/aws-upload-linux-debian.yml deleted file mode 100644 index 91d8d5ae55..0000000000 --- a/.github/workflows/aws-upload-linux-debian.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: Debian - Core - -on: - release: - types: [published] - # pull_request: - -jobs: - build-core-debian: - runs-on: ubuntu-latest - container: symless/synergy-vcpkg:${{ matrix.distro }} - env: - GIT_COMMIT: ${{ github.sha }} - SYNERGY_NO_LEGACY: "1" - SYNERGY_NO_TESTS: "1" - SYNERGY_STATIC_OPENSSL: "1" - VCPKG_LIBRARY_LINKAGE: "static" - strategy: - matrix: - distro: - - debian9 - - debian10 - - debian11 - - name: ${{ matrix.distro }} - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - mkdir build - cd build - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_TOOLCHAIN_FILE=${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake \ - .. - . ./version - make -j - - - uses: shallwefootball/s3-upload-action@master - if: "github.event_name == 'release'" - with: - aws_key_id: ${{ secrets.AWS_S3_UPLOAD_KEY_ID }} - aws_secret_access_key: ${{ secrets.AWS_S3_UPLOAD_SECRET }} - aws_bucket: ${{ secrets.AWS_BUCKET }} - source_dir: ./build/bin - destination_dir: "./synergy3/latest/${{matrix.distro}}/" - - - uses: actions/upload-artifact@v2 - if: "github.event_name == 'pull_request'" - with: - name: ${{ matrix.distro }} - path: build/bin/* - retention-days: 1 diff --git a/.github/workflows/aws-upload-linux-fedora.yml b/.github/workflows/aws-upload-linux-fedora.yml deleted file mode 100644 index c851dcd5f3..0000000000 --- a/.github/workflows/aws-upload-linux-fedora.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: Fedora - Core - -on: - release: - types: [published] - # pull_request: - -jobs: - build-core-fedora: - runs-on: ubuntu-latest - container: symless/synergy-vcpkg:${{ matrix.distro }} - env: - GIT_COMMIT: ${{ github.sha }} - SYNERGY_NO_LEGACY: "1" - SYNERGY_NO_TESTS: "1" - SYNERGY_STATIC_OPENSSL: "1" - VCPKG_LIBRARY_LINKAGE: "static" - strategy: - matrix: - distro: - - fedora33 - - fedora34 - - name: ${{ matrix.distro }} - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - mkdir build - cd build - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX:PATH=$(pwd)/rpm/BUILDROOT/usr \ - -DCMAKE_TOOLCHAIN_FILE=${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake \ - .. - . ./version - make -j - - - uses: shallwefootball/s3-upload-action@master - if: "github.event_name == 'release'" - with: - aws_key_id: ${{ secrets.AWS_S3_UPLOAD_KEY_ID }} - aws_secret_access_key: ${{ secrets.AWS_S3_UPLOAD_SECRET }} - aws_bucket: ${{ secrets.AWS_BUCKET }} - source_dir: ./build/bin - destination_dir: "./synergy3/latest/${{matrix.distro}}/" - - - uses: actions/upload-artifact@v2 - if: "github.event_name == 'pull_request'" - with: - name: ${{ matrix.distro }} - path: build/bin/* - retention-days: 1 diff --git a/.github/workflows/aws-upload-linux-ubuntu.yml b/.github/workflows/aws-upload-linux-ubuntu.yml deleted file mode 100644 index 3e4f0e37c0..0000000000 --- a/.github/workflows/aws-upload-linux-ubuntu.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: Ubuntu - Core - -on: - release: - types: [published] - # pull_request: - -jobs: - build-core-ubuntu: - runs-on: ubuntu-latest - container: symless/synergy-vcpkg:${{ matrix.distro }} - env: - GIT_COMMIT: ${{ github.sha }} - SYNERGY_NO_LEGACY: "1" - SYNERGY_NO_TESTS: "1" - SYNERGY_STATIC_OPENSSL: "1" - VCPKG_LIBRARY_LINKAGE: "static" - strategy: - matrix: - distro: - - ubuntu18.04 - - ubuntu20.04 - - ubuntu21.04 - - name: ${{ matrix.distro }} - - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - - name: Build - run: | - git submodule - mkdir build - cd build - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_TOOLCHAIN_FILE=${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake \ - .. - . ./version - make -j - - - uses: shallwefootball/s3-upload-action@master - if: "github.event_name == 'release'" - with: - aws_key_id: ${{ secrets.AWS_S3_UPLOAD_KEY_ID }} - aws_secret_access_key: ${{ secrets.AWS_S3_UPLOAD_SECRET }} - aws_bucket: ${{ secrets.AWS_BUCKET }} - source_dir: ./build/bin - destination_dir: "./synergy3/latest/${{matrix.distro}}/" - - - uses: actions/upload-artifact@v2 - if: "github.event_name == 'pull_request'" - with: - name: ${{ matrix.distro }} - path: build/bin/* - retention-days: 1 diff --git a/.github/workflows/aws-upload-mac.yml b/.github/workflows/aws-upload-mac.yml deleted file mode 100644 index d5fa86998d..0000000000 --- a/.github/workflows/aws-upload-mac.yml +++ /dev/null @@ -1,67 +0,0 @@ -name: macOS - Core - -on: - release: - types: [published] - # pull_request: - -jobs: - build-core-macos: - runs-on: ${{ matrix.os }} - - defaults: - run: - shell: ${{ matrix.shell }} - - strategy: - matrix: - include: - - os: "macos-10.15" - target: "10.14" - shell: "bash" - destination: macOS_x64 - - os: [self-hosted, macOS, arm64] - target: "" - shell: "/usr/bin/arch -arch arm64e /bin/bash --noprofile --norc -eo pipefail {0}" - destination: macOS_arm64 - - env: - GIT_COMMIT: ${{ github.sha }} - SYNERGY_NO_LEGACY: "1" - SYNERGY_NO_TESTS: "1" - SYNERGY_STATIC_OPENSSL: "1" - - steps: - - uses: actions/checkout@v2 - - - name: Install brew dependencies - run: | - brew list openssl &>/dev/null || brew install openssl - - - name: Build - env: - CMAKE_OSX_DEPLOYMENT_TARGET: ${{ matrix.target }} - run: | - mkdir build - cd build - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_PREFIX_PATH="$(brew --prefix openssl)" .. - . ./version - make -j - - - uses: shallwefootball/s3-upload-action@master - if: "github.event_name == 'release'" - with: - aws_key_id: ${{ secrets.AWS_S3_UPLOAD_KEY_ID }} - aws_secret_access_key: ${{ secrets.AWS_S3_UPLOAD_SECRET }} - aws_bucket: ${{ secrets.AWS_BUCKET }} - source_dir: ./build/bin - destination_dir: "./synergy3/latest/${{ matrix.destination }}/" - - - uses: actions/upload-artifact@v2 - if: "github.event_name == 'pull_request'" - with: - name: ${{ matrix.destination }} - path: build/bin/* - retention-days: 1 diff --git a/.github/workflows/aws-upload-raspberry.yml b/.github/workflows/aws-upload-raspberry.yml deleted file mode 100644 index da82bb8d00..0000000000 --- a/.github/workflows/aws-upload-raspberry.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: Raspberry Pi - Core - -on: - release: - types: [published] - # pull_request: - -jobs: - build-core-pi: - runs-on: ${{ matrix.os }} - strategy: - matrix: - include: - - os: [self-hosted, linux, ARM, pi-3] - destination: "raspberry-pi-3_arm" - - os: [self-hosted, linux, ARM64, pi-4] - destination: "raspberry-pi-4_arm64" - env: - GIT_COMMIT: ${{ github.sha }} - SYNERGY_NO_LEGACY: "1" - SYNERGY_NO_TESTS: "1" - SYNERGY_STATIC_OPENSSL: "1" - - steps: - - uses: actions/checkout@v2 - - - name: Build - run: | - mkdir -p build; cd build - cmake -DCMAKE_BUILD_TYPE=Release .. - make - - - uses: shallwefootball/s3-upload-action@master - if: "github.event_name == 'release'" - with: - aws_key_id: ${{ secrets.AWS_S3_UPLOAD_KEY_ID }} - aws_secret_access_key: ${{ secrets.AWS_S3_UPLOAD_SECRET }} - aws_bucket: ${{ secrets.AWS_BUCKET }} - source_dir: ./build/bin - destination_dir: "./synergy3/latest/${{ matrix.destination }}" - - - uses: actions/upload-artifact@v2 - if: "github.event_name == 'pull_request'" - with: - name: ${{ matrix.destination }} - path: build/bin/* - retention-days: 1 diff --git a/.github/workflows/aws-upload-windows.yml b/.github/workflows/aws-upload-windows.yml deleted file mode 100644 index 63140827c1..0000000000 --- a/.github/workflows/aws-upload-windows.yml +++ /dev/null @@ -1,72 +0,0 @@ -name: Windows - Core - -on: - release: - types: [published] - # pull_request: - -jobs: - build-core-windows: - runs-on: windows-2019 - - env: - GIT_COMMIT: ${{ github.sha }} - BONJOUR_BASE_DIR: ${{ github.workspace }}\deps\bonjour - SYNERGY_NO_LEGACY: "1" - SYNERGY_NO_TESTS: "1" - SYNERGY_STATIC_OPENSSL: "1" - - steps: - - uses: actions/checkout@v2 - - - name: Cache Bonjour - id: cache-bonjour - uses: actions/cache@v1 - with: - path: ${{ env.BONJOUR_BASE_DIR }} - key: ${{ runner.os }}-Bonjour - - - name: Install Bonjour SDK - if: steps.cache-bonjour.outputs.cache-hit != 'true' - run: | - New-Item -Force -ItemType Directory -Path "$env:BONJOUR_BASE_DIR" - $client = new-object System.Net.WebClient - $client.DownloadFile("https://binaries.symless.com/bonjour/BonjourSDK.zip",".\bonjoursdk.zip") - [System.IO.Compression.ZipFile]::ExtractToDirectory(".\bonjoursdk.zip", "$env:BONJOUR_BASE_DIR") - - - name: Install OpenSSL - run: | - choco uninstall openssl -y --ignore-autouninstaller-failure --no-progress - choco install openssl -y --no-progress - - - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.0.2 - - - name: Build - env: - CMAKE_PREFIX_PATH: "C:\\Program Files\\OpenSSL-Win64" - run: | - mkdir build - cd build - cmake -DCMAKE_BUILD_TYPE=Release .. - . ./version - msbuild synergy-core.sln ` - /p:Platform="x64" ` - /p:Configuration=Release ` - /m - - - uses: anshulrgoyal/upload-s3-action@master - if: "github.event_name == 'release'" - with: - aws_key_id: ${{ secrets.AWS_S3_UPLOAD_KEY_ID }} - aws_secret_access_key: ${{ secrets.AWS_S3_UPLOAD_SECRET }} - aws_bucket: ${{ secrets.AWS_BUCKET }} - source_dir: ./build/bin/Release - destination_dir: "./synergy3/latest/Windows_x64/" - - - uses: actions/upload-artifact@v2 - if: "github.event_name == 'pull_request'" - with: - name: windows - path: build/bin/Release/* - retention-days: 1 diff --git a/.github/workflows/job-build-mac-10.13.yaml b/.github/workflows/job-build-mac-10.13.yaml index d33b0bd241..29fcc0a951 100644 --- a/.github/workflows/job-build-mac-10.13.yaml +++ b/.github/workflows/job-build-mac-10.13.yaml @@ -6,11 +6,11 @@ on: jobs: build-on-mac-10_13: - runs-on: [self-hosted, macOS, X64, 10.13] + runs-on: [self-hosted, macOS, X64, "10.13"] strategy: matrix: - enterprise: ['1', ''] + enterprise: ["1", ""] env: GIT_COMMIT: ${{ github.sha }} SYNERGY_ENTERPRISE: ${{ matrix.enterprise }} @@ -24,7 +24,7 @@ jobs: - name: Setup Environment run: | python3 -m pip install dmgbuild - + - name: Build SYNERGY env: CMAKE_PREFIX_PATH: "${{ env.Qt5_DIR }};${{ env.OpenSSL_DIR }}" @@ -60,10 +60,10 @@ jobs: if [ "$SYNERGY_ENTERPRISE" == '1' ] then SYNERGY_PACKAGE_NAME='synergy-enterprise' - SYNERGY_REMOTE_FOLDER="synergy-core/v1-core-enterprise/${SYNERGY_VERSION}/${SYNERGY_VERSION_STAGE}/b${SYNERGY_VERSION_BUILD}-${SYNERGY_REVISION}" + SYNERGY_REMOTE_FOLDER="v1-core-enterprise/${SYNERGY_VERSION}/${SYNERGY_VERSION_STAGE}/b${SYNERGY_VERSION_BUILD}-${SYNERGY_REVISION}" else SYNERGY_PACKAGE_NAME='synergy' - SYNERGY_REMOTE_FOLDER="synergy-core/v1-core-standard/${SYNERGY_VERSION}/${SYNERGY_VERSION_STAGE}/b${SYNERGY_VERSION_BUILD}-${SYNERGY_REVISION}" + SYNERGY_REMOTE_FOLDER="v1-core-standard/${SYNERGY_VERSION}/${SYNERGY_VERSION_STAGE}/b${SYNERGY_VERSION_BUILD}-${SYNERGY_REVISION}" fi SYNERGY_DMG_FILENAME="${SYNERGY_PACKAGE_NAME}_${SYNERGY_DMG_VERSION}_macos-10.13_x86-64.dmg" echo "SYNERGY_REMOTE_FOLDER: $SYNERGY_REMOTE_FOLDER" @@ -106,15 +106,11 @@ jobs: cd pkg ../CI/MacOS/notorize.sh - - name: Send package to Sandor - env: - HOST: ${{ secrets.SANDOR_HOST }} - USER: ${{ secrets.SANDOR_USERNAME }} - KEY: ${{ secrets.SANDOR_KEY }} - LOCAL: "${{ github.workspace }}/pkg/*" - REMOTE: "${{ steps.version.outputs.SYNERGY_REMOTE_FOLDER }}" - run: | - echo -e "${KEY}" >__TEMP_INPUT_KEY_FILE - chmod 600 __TEMP_INPUT_KEY_FILE - ssh -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -p 22 "${USER}"@"${HOST}" "mkdir -p ${REMOTE}" - scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P 22 -r ${LOCAL} "${USER}"@"${HOST}":"${REMOTE}" + - name: Send package to Binary Storage + uses: garygrossgarten/github-action-scp@v0.7.3 + with: + local: "${{ github.workspace }}/pkg/" + remote: "${{ secrets.BINARIES_SSH_DIR }}/${{ steps.version.outputs.SYNERGY_REMOTE_FOLDER }}/" + host: ${{ secrets.BINARIES_SSH_HOST }} + username: ${{ secrets.BINARIES_SSH_USER }} + privateKey: ${{ secrets.BINARIES_SSH_KEY }} diff --git a/.github/workflows/job-build-mac-m1.yaml b/.github/workflows/job-build-mac-m1.yaml index 32c89a9054..0c9cb99dcc 100644 --- a/.github/workflows/job-build-mac-m1.yaml +++ b/.github/workflows/job-build-mac-m1.yaml @@ -61,10 +61,10 @@ jobs: if [ "$SYNERGY_ENTERPRISE" == '1' ] then SYNERGY_PACKAGE_NAME='synergy-enterprise' - SYNERGY_REMOTE_FOLDER="synergy-core/v1-core-enterprise/${SYNERGY_VERSION}/${SYNERGY_VERSION_STAGE}/b${SYNERGY_VERSION_BUILD}-${SYNERGY_REVISION}" + SYNERGY_REMOTE_FOLDER="v1-core-enterprise/${SYNERGY_VERSION}/${SYNERGY_VERSION_STAGE}/b${SYNERGY_VERSION_BUILD}-${SYNERGY_REVISION}" else SYNERGY_PACKAGE_NAME='synergy' - SYNERGY_REMOTE_FOLDER="synergy-core/v1-core-standard/${SYNERGY_VERSION}/${SYNERGY_VERSION_STAGE}/b${SYNERGY_VERSION_BUILD}-${SYNERGY_REVISION}" + SYNERGY_REMOTE_FOLDER="v1-core-standard/${SYNERGY_VERSION}/${SYNERGY_VERSION_STAGE}/b${SYNERGY_VERSION_BUILD}-${SYNERGY_REVISION}" fi SYNERGY_DMG_FILENAME="${SYNERGY_PACKAGE_NAME}_${SYNERGY_DMG_VERSION}_macos-arm64.dmg" echo "SYNERGY_REMOTE_FOLDER: $SYNERGY_REMOTE_FOLDER" @@ -107,15 +107,11 @@ jobs: cd pkg ../CI/MacOS/notorize.sh - - name: Send package to Sandor - env: - HOST: ${{ secrets.SANDOR_HOST }} - USER: ${{ secrets.SANDOR_USERNAME }} - KEY: ${{ secrets.SANDOR_KEY }} - LOCAL: "${{ github.workspace }}/pkg/*" - REMOTE: "${{ steps.version.outputs.SYNERGY_REMOTE_FOLDER }}" - run: | - echo -e "${KEY}" >__TEMP_INPUT_KEY_FILE - chmod 600 __TEMP_INPUT_KEY_FILE - ssh -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -p 22 "${USER}"@"${HOST}" "mkdir -p ${REMOTE}" - scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P 22 -r ${LOCAL} "${USER}"@"${HOST}":"${REMOTE}" + - name: Send package to Binary Storage + uses: garygrossgarten/github-action-scp@v0.7.3 + with: + local: "${{ github.workspace }}/pkg/" + remote: "${{ secrets.BINARIES_SSH_DIR }}/${{ steps.version.outputs.SYNERGY_REMOTE_FOLDER }}/" + host: ${{ secrets.BINARIES_SSH_HOST }} + username: ${{ secrets.BINARIES_SSH_USER }} + privateKey: ${{ secrets.BINARIES_SSH_KEY }} diff --git a/.github/workflows/job-build-raspberry-pi.yaml b/.github/workflows/job-build-raspberry-pi.yaml index a8147c50f8..48f90e0692 100644 --- a/.github/workflows/job-build-raspberry-pi.yaml +++ b/.github/workflows/job-build-raspberry-pi.yaml @@ -39,10 +39,10 @@ jobs: echo "::set-output name=SYNERGY_DEB_VERSION::${SYNERGY_DEB_VERSION}" if [ "$SYNERGY_ENTERPRISE" == '1' ] then - echo "::set-output name=SYNERGY_REMOTE_FOLDER::synergy-core/v1-core-enterprise/${SYNERGY_VERSION}/${SYNERGY_VERSION_STAGE}/b${SYNERGY_VERSION_BUILD}-${SYNERGY_REVISION}" + echo "::set-output name=SYNERGY_REMOTE_FOLDER::v1-core-enterprise/${SYNERGY_VERSION}/${SYNERGY_VERSION_STAGE}/b${SYNERGY_VERSION_BUILD}-${SYNERGY_REVISION}" echo "::set-output name=SYNERGY_PACKAGE_NAME::synergy-enterprise" else - echo "::set-output name=SYNERGY_REMOTE_FOLDER::synergy-core/v1-core-standard/${SYNERGY_VERSION}/${SYNERGY_VERSION_STAGE}/b${SYNERGY_VERSION_BUILD}-${SYNERGY_REVISION}" + echo "::set-output name=SYNERGY_REMOTE_FOLDER::v1-core-standard/${SYNERGY_VERSION}/${SYNERGY_VERSION_STAGE}/b${SYNERGY_VERSION_BUILD}-${SYNERGY_REVISION}" echo "::set-output name=SYNERGY_PACKAGE_NAME::synergy" fi @@ -67,11 +67,11 @@ jobs: sha1sum $filename_new >> ${filename_new}.checksum.txt sha256sum $filename_new >> ${filename_new}.checksum.txt - - name: Send package to Sandor - uses: horochx/deploy-via-scp@master + - name: Send package to Binary Storage + uses: garygrossgarten/github-action-scp@v0.7.3 with: - host: ${{ secrets.SANDOR_HOST }} - user: ${{ secrets.SANDOR_USERNAME }} - key: ${{ secrets.SANDOR_KEY }} - local: "./package/*" - remote: "${{ steps.version.outputs.SYNERGY_REMOTE_FOLDER }}" + local: "${{ github.workspace }}/package/" + remote: "${{ secrets.BINARIES_SSH_DIR }}/${{ steps.version.outputs.SYNERGY_REMOTE_FOLDER }}/" + host: ${{ secrets.BINARIES_SSH_HOST }} + username: ${{ secrets.BINARIES_SSH_USER }} + privateKey: ${{ secrets.BINARIES_SSH_KEY }} diff --git a/CI/Linux/linux-build.yml b/CI/Linux/linux-build.yml index 917c5fe382..d0bd8cc801 100644 --- a/CI/Linux/linux-build.yml +++ b/CI/Linux/linux-build.yml @@ -146,18 +146,18 @@ steps: - task: CopyFilesOverSSH@0 inputs: - sshEndpoint: 'Azure on Sandor' + sshEndpoint: 'Binary Storage' sourceFolder: './standard_package' contents: '*' - targetFolder: 'synergy-core/v1-core-standard/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/b$(SYNERGY_VERSION_BUILD)-$(SYNERGY_REVISION)/' + targetFolder: '$(BINARIES_DIR)/v1-core-standard/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/b$(SYNERGY_VERSION_BUILD)-$(SYNERGY_REVISION)/' readyTimeout: '20000' - displayName: 'Send standard Package to sandor' + displayName: 'Send standard package to Binary Storage' - task: CopyFilesOverSSH@0 inputs: - sshEndpoint: 'Azure on Sandor' + sshEndpoint: 'Binary Storage' sourceFolder: './enterprise_package' contents: '*' - targetFolder: 'synergy-core/v1-core-enterprise/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/b$(SYNERGY_VERSION_BUILD)-$(SYNERGY_REVISION)/' + targetFolder: '$(BINARIES_DIR)/v1-core-enterprise/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/b$(SYNERGY_VERSION_BUILD)-$(SYNERGY_REVISION)/' readyTimeout: '20000' - displayName: 'Send enterprise Package to sandor' \ No newline at end of file + displayName: 'Send enterprise package to Binary Storage' \ No newline at end of file diff --git a/CI/MacOS/mac-build.yml b/CI/MacOS/mac-build.yml index 3db29b91c2..0b34d7d75d 100644 --- a/CI/MacOS/mac-build.yml +++ b/CI/MacOS/mac-build.yml @@ -125,9 +125,9 @@ steps: - task: CopyFilesOverSSH@0 inputs: - sshEndpoint: 'Azure on Sandor' + sshEndpoint: 'Binary Storage' sourceFolder: '$(Build.Repository.LocalPath)/pkg' contents: '*' - targetFolder: 'synergy-core/v1-core-$(buildType)/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/b$(SYNERGY_VERSION_BUILD)-$(SYNERGY_REVISION)/' + targetFolder: '$(BINARIES_DIR)/v1-core-$(buildType)/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/b$(SYNERGY_VERSION_BUILD)-$(SYNERGY_REVISION)/' readyTimeout: '20000' - displayName: 'Send Package to sandor' + displayName: 'Send package to Binary Storage' diff --git a/CI/Windows/windows-build.yml b/CI/Windows/windows-build.yml index 28a03d9319..b9c599b213 100644 --- a/CI/Windows/windows-build.yml +++ b/CI/Windows/windows-build.yml @@ -212,29 +212,29 @@ steps: - task: CopyFilesOverSSH@0 inputs: - sshEndpoint: 'Azure on Sandor' + sshEndpoint: 'Binary Storage' sourceFolder: '$(Build.ArtifactStagingDirectory)/' contents: '*.zip' - targetFolder: 'synergy-core/v1-core-$(buildType)/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/b$(SYNERGY_VERSION_BUILD)-$(SYNERGY_REVISION)/' + targetFolder: '$(BINARIES_DIR)/v1-core-$(buildType)/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/b$(SYNERGY_VERSION_BUILD)-$(SYNERGY_REVISION)/' readyTimeout: '20000' - displayName: 'Send archives to sandor' + displayName: 'Send archives to Binary Storage' condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') - task: CopyFilesOverSSH@0 inputs: - sshEndpoint: 'Azure on Sandor' + sshEndpoint: 'Binary Storage' sourceFolder: '$(Build.Repository.LocalPath)\build32\installer\bin\Release\' contents: '*' - targetFolder: 'synergy-core/v1-core-$(buildType)/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/b$(SYNERGY_VERSION_BUILD)-$(SYNERGY_REVISION)/' + targetFolder: '$(BINARIES_DIR)/v1-core-$(buildType)/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/b$(SYNERGY_VERSION_BUILD)-$(SYNERGY_REVISION)/' readyTimeout: '20000' - displayName: 'Send x86 Package to sandor' + displayName: 'Send x86 package to Binary Storage' - task: CopyFilesOverSSH@0 inputs: - sshEndpoint: 'Azure on Sandor' + sshEndpoint: 'Binary Storage' sourceFolder: '$(Build.Repository.LocalPath)\build64\installer\bin\Release\' contents: '*' - targetFolder: 'synergy-core/v1-core-$(buildType)/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/b$(SYNERGY_VERSION_BUILD)-$(SYNERGY_REVISION)/' + targetFolder: '$(BINARIES_DIR)/v1-core-$(buildType)/$(SYNERGY_VERSION)/$(SYNERGY_VERSION_STAGE)/b$(SYNERGY_VERSION_BUILD)-$(SYNERGY_REVISION)/' readyTimeout: '20000' - displayName: 'Send x64 Package to sandor' + displayName: 'Send x64 package to Binary Storage' diff --git a/ChangeLog b/ChangeLog index 342d12fe39..f98e19ac7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Enhancements: Github Actions: - #7148 Fix unstable build for windows core +- #7156 Change binary storage server =========== v1.14.3-snapshot