Merge branch '7.0' into fix-contributing-guide

supertokens · Oct 15, 2023 · 443fb85 · 443fb85
2 parents 884e156 + dffa751
commit 443fb85
Show file tree

Hide file tree

Showing 10 changed files with 105 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -13,6 +13,10 @@ jobs:
     steps:
       - checkout
       - run: echo $'\n[mysqld]\ncharacter_set_server=utf8mb4\nmax_connections=10000' >> /etc/mysql/mysql.cnf
+      - run: apt-get -y -q install postgresql-9.5 postgresql-client-9.5 postgresql-contrib-9.5 sudo
+      - run: echo "host all  all    0.0.0.0/0  md5" >> /etc/postgresql/9.5/main/pg_hba.conf
+      - run: echo "listen_addresses='*'" >> /etc/postgresql/9.5/main/postgresql.conf
+      - run: sed -i 's/^#*\s*max_connections\s*=.*/max_connections = 10000/' /etc/postgresql/9.5/main/postgresql.conf
       - run: (cd .circleci/ && ./doTests.sh)
       - slack/status
 

diff --git a/.circleci/doTests.sh b/.circleci/doTests.sh
@@ -84,6 +84,18 @@ do
         currPinnedDb=$(echo "$pinnedDBArray" | jq ".[$i]")
         currPinnedDb=$(echo "$currPinnedDb" | tr -d '"')
 
+        echo ""
+        echo ""
+        echo ""
+        echo ""
+        echo ""
+        echo "===== testing $currPinnedDb with plugin-interface $currVersion ====="
+        echo ""
+        echo ""
+        echo ""
+        echo ""
+        echo ""
+
         i=$((i+1))
 
         if [[ $currPinnedDb == "sqlite" ]]
@@ -148,11 +160,36 @@ do
 
         if [[ $? -ne 0 ]]
         then
+            echo ""
+            echo ""
+            echo ""
+            echo ""
+            echo ""
+            echo "===== testing $currPinnedDb with plugin-interface $currVersion FAILED ====="
+            echo ""
+            echo ""
+            echo ""
+            echo ""
+            echo ""
+
             cat logs/*
             cd ../project/
             echo "test failed... exiting!"
             exit 1
         fi
+
+        echo ""
+        echo ""
+        echo ""
+        echo ""
+        echo ""
+        echo "===== testing $currPinnedDb with plugin-interface $currVersion SUCCEEDED ====="
+        echo ""
+        echo ""
+        echo ""
+        echo ""
+        echo ""
+
         cd ../
         rm -rf supertokens-root
 

diff --git a/.circleci/startDb.sh b/.circleci/startDb.sh
@@ -54,4 +54,60 @@ case $1 in
         mysql -u root --password=root -e "CREATE DATABASE st49;"
         mysql -u root --password=root -e "CREATE DATABASE st50;"
         ;;
+    postgresql)
+        /etc/init.d/postgresql start
+        sudo -u postgres psql --command "CREATE USER root WITH SUPERUSER PASSWORD 'root';"
+        createdb
+        psql -c "create database supertokens;"
+        psql -c "create database st0;"
+        psql -c "create database st1;"
+        psql -c "create database st2;"
+        psql -c "create database st3;"
+        psql -c "create database st4;"
+        psql -c "create database st5;"
+        psql -c "create database st6;"
+        psql -c "create database st7;"
+        psql -c "create database st8;"
+        psql -c "create database st9;"
+        psql -c "create database st10;"
+        psql -c "create database st11;"
+        psql -c "create database st12;"
+        psql -c "create database st13;"
+        psql -c "create database st14;"
+        psql -c "create database st15;"
+        psql -c "create database st16;"
+        psql -c "create database st17;"
+        psql -c "create database st18;"
+        psql -c "create database st19;"
+        psql -c "create database st20;"
+        psql -c "create database st21;"
+        psql -c "create database st22;"
+        psql -c "create database st23;"
+        psql -c "create database st24;"
+        psql -c "create database st25;"
+        psql -c "create database st26;"
+        psql -c "create database st27;"
+        psql -c "create database st28;"
+        psql -c "create database st29;"
+        psql -c "create database st30;"
+        psql -c "create database st31;"
+        psql -c "create database st32;"
+        psql -c "create database st33;"
+        psql -c "create database st34;"
+        psql -c "create database st35;"
+        psql -c "create database st36;"
+        psql -c "create database st37;"
+        psql -c "create database st38;"
+        psql -c "create database st39;"
+        psql -c "create database st40;"
+        psql -c "create database st41;"
+        psql -c "create database st42;"
+        psql -c "create database st43;"
+        psql -c "create database st44;"
+        psql -c "create database st45;"
+        psql -c "create database st46;"
+        psql -c "create database st47;"
+        psql -c "create database st48;"
+        psql -c "create database st49;"
+        psql -c "create database st50;"
 esac
diff --git a/.circleci/stopDb.sh b/.circleci/stopDb.sh
@@ -2,4 +2,7 @@ case $1 in
     mysql)
         service mysql stop
         ;;
+    postgresql)
+        service postgresql stop
+        ;;
 esac
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [7.0.5] - 2023-10-13
+
+- Adds postgres testing to the CICD
+
 ## [7.0.4] - 2023-10-12
 
 - Fixes user info from primary user id query

diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ compileTestJava { options.encoding = "UTF-8" }
 //    }
 //}
 
-version = "7.0.4"
+version = "7.0.5"
 
 
 repositories {

diff --git a/cli/jar/cli.jar b/cli/jar/cli.jar
diff --git a/downloader/jar/downloader.jar b/downloader/jar/downloader.jar
diff --git a/ee/jar/ee.jar b/ee/jar/ee.jar
diff --git a/jar/core-7.0.4.jar → jar/core-7.0.5.jar b/jar/core-7.0.4.jar → jar/core-7.0.5.jar
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ compileTestJava { options.encoding = "UTF-8" } @@
     //    }
     //}
-    version = "7.0.4"
+    version = "7.0.5"
     repositories {
@@ Expand Down @@