diff --git a/.circleci/config.yml b/.circleci/config.yml index ca00a9f..6fc847a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -185,24 +185,8 @@ jobs: paths: - speckle-sharp-ci-tools - deploy: # Uploads all installers found to S3 - docker: - - image: cimg/base:2021.01 - steps: - - attach_workspace: - at: ./ - - run: - name: List contents - command: ls -R speckle-sharp-ci-tools/Installers - - aws-s3/copy: - arguments: "--recursive --endpoint=https://$SPACES_REGION.digitaloceanspaces.com --acl public-read" - aws-access-key-id: SPACES_KEY - aws-region: SPACES_REGION - aws-secret-access-key: SPACES_SECRET - from: '"speckle-sharp-ci-tools/Installers/"' - to: s3://speckle-releases/installers/ - deploy-manager2: + deploy-connector-new: docker: - image: mcr.microsoft.com/dotnet/sdk:6.0 parameters: @@ -212,6 +196,9 @@ jobs: type: string extension: type: string + arch: + type: string + default: Any steps: - checkout - attach_workspace: @@ -224,7 +211,7 @@ jobs: command: | TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "0.0.0"; fi;) SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]*//') - /root/.dotnet/tools/Speckle.Manager.Feed deploy -s << parameters.slug >> -v ${SEMVER} -u https://releases.speckle.dev/installers/<< parameters.slug >>/<< parameters.slug >>-${SEMVER}.<< parameters.extension >> -o << parameters.os >> -f speckle-sharp-ci-tools/Installers/<< parameters.slug >>/<< parameters.slug >>-${SEMVER}.<< parameters.extension >> + /root/.dotnet/tools/Speckle.Manager.Feed deploy -s << parameters.slug >> -v ${SEMVER} -u https://releases.speckle.dev/installers/<< parameters.slug >>/<< parameters.slug >>-${SEMVER}.<< parameters.extension >> -o << parameters.os >> -a << parameters.arch >> -f speckle-sharp-ci-tools/Installers/<< parameters.slug >>/<< parameters.slug >>-${SEMVER}.<< parameters.extension >> workflows: build: # build the installers, but don't persist to workspace for deployment @@ -303,9 +290,13 @@ workflows: branches: ignore: /.*/ - - deploy: + - deploy-connector-new: + name: deploy-win + slug: blender + os: Win + extension: exe + arch: Any requires: - - get-ci-tools - Windows Build&Deploy - Mac ARM Build&Deploy - Mac Intel Build&Deploy @@ -313,16 +304,36 @@ workflows: tags: only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/ branches: - ignore: /.*/ + ignore: /.*/ # For testing only! /ci\/.*/ - - deploy-manager2: - slug: blender - os: Win - extension: exe + - deploy-connector-new: + name: deploy-mac-intel + slug: blender-mac-intel + os: OSX + extension: zip + arch: Intel requires: - - deploy + - Windows Build&Deploy + - Mac ARM Build&Deploy + - Mac Intel Build&Deploy filters: tags: only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/ branches: ignore: /.*/ # For testing only! /ci\/.*/ + + - deploy-connector-new: + name: deploy-mac-arm + slug: blender-mac-arm + os: OSX + extension: zip + arch: Arm + requires: + - Windows Build&Deploy + - Mac ARM Build&Deploy + - Mac Intel Build&Deploy + filters: + tags: + only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/ + branches: + ignore: /.*/ # For testing only! /ci\/.*/ \ No newline at end of file