Skip to content

Commit ebfb645

Browse files
authored
Merge for 2.26.6 release (#604)
## Usage and product changes We merge development into master for 2.26.6 release.
2 parents acc7e91 + 5073d2f commit ebfb645

File tree

15 files changed

+259
-918
lines changed

15 files changed

+259
-918
lines changed

.circleci/config.yml

Lines changed: 52 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ commands:
9494
sudo mv "bazelisk-darwin-<<parameters.bazel-arch>>" /usr/local/bin/bazel
9595
chmod a+x /usr/local/bin/bazel
9696
97+
install-brew-rosetta:
98+
steps:
99+
- run: arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
100+
97101
###########################
98102
# Python deployment steps #
99103
###########################
@@ -129,6 +133,23 @@ commands:
129133
tool/test/stop-core-server.sh
130134
exit $TEST_SUCCESS
131135
136+
test-pip-snapshot-mac-rosetta:
137+
steps:
138+
- install-brew-rosetta
139+
- run: |
140+
/usr/local/bin/brew install [email protected]
141+
tool/test/start-core-server.sh
142+
/usr/local/bin/python3.8 -m pip install wheel
143+
/usr/local/bin/python3.8 -m pip install pip==21.3.1
144+
/usr/local/bin/python3.8 -m pip install -r python/requirements_dev.txt
145+
/usr/local/bin/python3.8 -m pip install --extra-index-url https://repo.typedb.com/public/public-snapshot/python/simple typedb-driver==0.0.0+$(git rev-parse HEAD)
146+
sleep 3
147+
pushd python/tests/deployment/
148+
/usr/local/bin/python3.8 -m unittest test && export TEST_SUCCESS=0 || export TEST_SUCCESS=1
149+
popd
150+
tool/test/stop-core-server.sh
151+
exit $TEST_SUCCESS
152+
132153
deploy-pip-release-unix:
133154
steps:
134155
- install-pip-requirements
@@ -149,6 +170,11 @@ commands:
149170
steps:
150171
- run: brew install maven
151172

173+
install-maven-mac-rosetta:
174+
steps:
175+
- install-brew-rosetta
176+
- run: /usr/local/bin/brew install maven
177+
152178
install-maven-linux:
153179
steps:
154180
- run: yum install -y maven
@@ -176,6 +202,15 @@ commands:
176202
(cd java/test/deployment && mvn test)
177203
tool/test/stop-core-server.sh
178204
205+
test-maven-snapshot-mac-rosetta:
206+
steps:
207+
- run: |
208+
tool/test/start-core-server.sh
209+
sed -i -e "s/DRIVER_JAVA_VERSION_MARKER/0.0.0-$CIRCLE_SHA1/g" java/test/deployment/pom.xml
210+
cat java/test/deployment/pom.xml
211+
(cd java/test/deployment && /usr/local/bin/mvn test)
212+
tool/test/stop-core-server.sh
213+
179214
deploy-maven-jni-release-unix:
180215
steps:
181216
- run: |
@@ -529,9 +564,9 @@ jobs:
529564
- checkout
530565
- install-bazel-brew:
531566
bazel-arch: amd64
532-
- test-pip-snapshot-unix
533-
- install-maven-mac
534-
- test-maven-snapshot-unix
567+
- test-pip-snapshot-mac-rosetta
568+
- install-maven-mac-rosetta
569+
- test-maven-snapshot-mac-rosetta
535570

536571
test-snapshot-windows-x86_64:
537572
executor:
@@ -650,8 +685,9 @@ jobs:
650685
- install-bazel-apt:
651686
bazel-arch: amd64
652687
- run: |
688+
apt update && apt install software-properties-common
653689
add-apt-repository ppa:deadsnakes/ppa
654-
apt update && apt install -y python3.9 python3.9-distutils python3-pip
690+
apt update && apt install -y python3.9 python3.9-distutils python3-pip software-properties-common
655691
python3.9 -m pip install -U cffi
656692
export SYNC_DEPENDENCIES_TOKEN=$REPO_GITHUB_TOKEN
657693
bazel run @vaticle_dependencies//tool/sync:dependencies -- --source ${CIRCLE_PROJECT_REPONAME}@$(cat VERSION)
@@ -672,28 +708,28 @@ workflows:
672708
- deploy-snapshot-linux-arm64:
673709
filters:
674710
branches:
675-
only: [master, development]
711+
only: [master]
676712
- deploy-snapshot-linux-x86_64:
677713
filters:
678714
branches:
679-
only: [master, development]
715+
only: [master]
680716
- deploy-snapshot-mac-arm64:
681717
filters:
682718
branches:
683-
only: [master, development]
719+
only: [master]
684720
- deploy-snapshot-mac-x86_64:
685721
filters:
686722
branches:
687-
only: [master, development]
723+
only: [master]
688724
- deploy-snapshot-windows-x86_64:
689725
filters:
690726
branches:
691-
only: [master, development]
727+
only: [master]
692728

693729
- deploy-snapshot-any:
694730
filters:
695731
branches:
696-
only: [master, development]
732+
only: [master]
697733
requires:
698734
- deploy-snapshot-linux-arm64
699735
- deploy-snapshot-linux-x86_64
@@ -704,43 +740,43 @@ workflows:
704740
- test-snapshot-linux-arm64:
705741
filters:
706742
branches:
707-
only: [master, development]
743+
only: [master]
708744
requires:
709745
- deploy-snapshot-linux-arm64
710746
- deploy-snapshot-any
711747
- test-snapshot-linux-x86_64:
712748
filters:
713749
branches:
714-
only: [master, development]
750+
only: [master]
715751
requires:
716752
- deploy-snapshot-linux-x86_64
717753
- deploy-snapshot-any
718754
- test-snapshot-mac-arm64:
719755
filters:
720756
branches:
721-
only: [master, development]
757+
only: [master]
722758
requires:
723759
- deploy-snapshot-mac-arm64
724760
- deploy-snapshot-any
725761
- test-snapshot-mac-x86_64:
726762
filters:
727763
branches:
728-
only: [master, development]
764+
only: [master]
729765
requires:
730766
- deploy-snapshot-mac-x86_64
731767
- deploy-snapshot-any
732768
- test-snapshot-windows-x86_64:
733769
filters:
734770
branches:
735-
only: [master, development]
771+
only: [master]
736772
requires:
737773
- deploy-snapshot-windows-x86_64
738774
- deploy-snapshot-any
739775

740776
- test-snapshot-any:
741777
filters:
742778
branches:
743-
only: [master, development]
779+
only: [master]
744780
requires:
745781
- deploy-snapshot-any
746782

0 commit comments

Comments
 (0)