From 6b021d5c73a56184e7435d23f76babdacc19e558 Mon Sep 17 00:00:00 2001 From: "dmitry.kashcheiev" Date: Fri, 24 Jun 2022 16:52:51 +0300 Subject: [PATCH 1/8] Make sure folder for credentials exist. --- .github/workflows/publish.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6cd876eeb..39dddbf58 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -28,6 +28,9 @@ jobs: - name: Build with gradle run: ./gradlew build --stacktrace + - name: Ensure credential directory exists + run: mkdir $XDG_CONFIG_HOME/dart/ + - name: Decrypt Pub credentials run: ./script/decrypt.sh "$PUB_CREDENTIALS_KEY" ./.github/keys/pub-credentials.json.gpg $XDG_CONFIG_HOME/dart/pub-credentials.json shell: bash @@ -35,4 +38,4 @@ jobs: PUB_CREDENTIALS_KEY: ${{ secrets.PUB_CREDENTIALS_KEY }} - name: Publish to Pub - run: ./gradlew publish -x test --stacktrace \ No newline at end of file + run: ./gradlew publish -x test --stacktrace From 80f6134692261ed26a700fd3287a51e8dab579b2 Mon Sep 17 00:00:00 2001 From: "dmitry.kashcheiev" Date: Fri, 24 Jun 2022 16:54:04 +0300 Subject: [PATCH 2/8] Create dart dir as well. --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 39dddbf58..5b85dcfe9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -29,7 +29,7 @@ jobs: run: ./gradlew build --stacktrace - name: Ensure credential directory exists - run: mkdir $XDG_CONFIG_HOME/dart/ + run: mkdir -p $XDG_CONFIG_HOME/dart/ - name: Decrypt Pub credentials run: ./script/decrypt.sh "$PUB_CREDENTIALS_KEY" ./.github/keys/pub-credentials.json.gpg $XDG_CONFIG_HOME/dart/pub-credentials.json From 5cbd3fb7d0fe943f54413d8f79d2626b6bae1794 Mon Sep 17 00:00:00 2001 From: "dmitry.kashcheiev" Date: Fri, 24 Jun 2022 16:55:04 +0300 Subject: [PATCH 3/8] Increase delay between command and query. --- integration-tests/client-test/integration-test/client_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/client-test/integration-test/client_test.dart b/integration-tests/client-test/integration-test/client_test.dart index ceea31b7d..bad151620 100644 --- a/integration-tests/client-test/integration-test/client_test.dart +++ b/integration-tests/client-test/integration-test/client_test.dart @@ -76,7 +76,7 @@ void main() { /// if they already create subscriptions, they are not likely to make a query as soon as /// an update occurs. /// - Future _sleep() => Future.delayed(Duration(seconds: 2)); + Future _sleep() => Future.delayed(Duration(seconds: 3)); test('send commands and obtain query data through Firebase RDB', () async { var taskId = TaskId() From eeda4c0f00c58018cdbda63b5d4bd26c866770da Mon Sep 17 00:00:00 2001 From: "dmitry.kashcheiev" Date: Fri, 24 Jun 2022 16:56:34 +0300 Subject: [PATCH 4/8] Update changelog. --- client/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/CHANGELOG.md b/client/CHANGELOG.md index c84ab7c4b..bb61e7229 100644 --- a/client/CHANGELOG.md +++ b/client/CHANGELOG.md @@ -61,3 +61,6 @@ ## 1.8.1 This release fixes the previously broken `dart_code_gen:1.8.0`. + +## 1.8.2 + This release removes web-based `firebase` implementation from the client. From 9878db6164ae665efb7884934ad83738159ec99c Mon Sep 17 00:00:00 2001 From: "dmitry.kashcheiev" Date: Fri, 24 Jun 2022 16:57:01 +0300 Subject: [PATCH 5/8] Update version in pubspec.yaml. --- client/pubspec.yaml | 2 +- codegen/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/pubspec.yaml b/client/pubspec.yaml index 4f15572c7..41743d9cd 100644 --- a/client/pubspec.yaml +++ b/client/pubspec.yaml @@ -1,6 +1,6 @@ name: spine_client description: Dart-based library for client applications of Spine-based systems. -version: 1.8.1 +version: 1.8.2 homepage: https://spine.io environment: diff --git a/codegen/pubspec.yaml b/codegen/pubspec.yaml index 75acc741e..08bd11348 100644 --- a/codegen/pubspec.yaml +++ b/codegen/pubspec.yaml @@ -1,6 +1,6 @@ name: dart_code_gen description: A command-line tool which generates Dart code for Protobuf type registries. -version: 1.8.1 +version: 1.8.2 homepage: https://spine.io environment: From eaa3756b61890dab8b00acbe420e8697efa557a1 Mon Sep 17 00:00:00 2001 From: "dmitry.kashcheiev" Date: Fri, 24 Jun 2022 17:30:23 +0300 Subject: [PATCH 6/8] Use modern CLI to generate doc files. --- client/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/build.gradle.kts b/client/build.gradle.kts index ec93c2b2f..fa923c562 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -67,7 +67,7 @@ tasks.assemble { val dartDocDir = Files.createTempDir() val dartDoc by tasks.creating(Exec::class) { - commandLine("dartdoc", "--output", dartDocDir.path, "$projectDir/lib/") + commandLine("dart", "doc", "--output", dartDocDir.path, "$projectDir/lib/") } afterEvaluate { From 0ae21be46f38ddd56a6ec65bebef5313bf2b28b5 Mon Sep 17 00:00:00 2001 From: "dmitry.kashcheiev" Date: Mon, 27 Jun 2022 17:09:09 +0300 Subject: [PATCH 7/8] AddGH action to publish docs. --- .github/keys/deploy_key_rsa.gpg | Bin 0 -> 2206 bytes .github/workflows/publish.yml | 8 ++++++++ 2 files changed, 8 insertions(+) create mode 100644 .github/keys/deploy_key_rsa.gpg diff --git a/.github/keys/deploy_key_rsa.gpg b/.github/keys/deploy_key_rsa.gpg new file mode 100644 index 0000000000000000000000000000000000000000..7f434966d62d927fca5b585af000eb38e136a29e GIT binary patch literal 2206 zcmV;P2x0e(4Fm}T0$4hv2!AFCvh>pH0U}n8(Np#N|CFjJSQMsbeVA9XFrY`2q}M7L zn5As1FN2O#;OxyfiC2U`7Ip4y_WeB>A4#RZ8QaHfCM>2yAoc|fx7L9U#}R&xFSg>= z3aG}4o|BY|TKoWJY2D+TLq*O;()JqOd8dPXM}hDh8+1@#Th+Wuq~eN5HVnia>_t#5 z?|Mu^Aj0o!OLU%(5#IzuyKk7v4iebKrq>;~OoLP@o;;?Eut}CtBjS&GvP`!}^vVGd zV-4?VKPGe6V?!7e=Gfv%s*Mx8F91rX z+p66n<;leMr^U&F*ZJ6vIBTYTm6o+2Dv?)fQH5J>>JU8x6aoi}-W`TN5s!k##OgY! zn*7>bkItZE;!nFV$qm&4oYEQkuZ+5w>B5LG2 z_>ayI1iN@g`OwxJaTtj7G(>k&7`(@D7*#iTTHD}QB;4p~$!dw!4C0x@T>Fq{U74-z zZOG_>1J#D~R4OFQ9ltv_iB3ZXRZEaUe7(YY^o{q@5cLM_%eVqUY5NHOzMuMWDpMfe$f*i-l&aMcom$0^I8mnY z8U`~v6_B)OV9z1!}E$DIkdGxn9O)Y7`Eq{Ik;M!Bx4OQr9+oV)Bc0dmPe>_6vJ{nUA% zWjM2*=VS1d@IZd#Wdmb^Y@^r?b9Spr@iuc7W9U02c1_;w zTroJ;@{YRZkTUID3O7y5J+Q4SkY3RBQJHIrQmx9&;AnedC;qRR#_7H7@S}8=4swM^ zGar&WPY((?nlK{jA77n|B&cvpovhnNEyw}M_oK32sfnQ(*RK}}Opn7!aY)or5Vm1LXE9GcC3q-nIk%QqY`bloMf(n z@dA9lA^b}HV%U@CbUA}_?Lb&e_o?>O6Z{lMYal@jR3 zp<=$rYz1SKy1w(Fv5{0x^v<_B1C-OHd9^FLE{V)j1i&k}$FBJ7W>OQ>FxkcMSz@9H z&yC^J1s)OpfnUUl%58rUFlxIwuwd$Hg3#r3mLZQ^aOp~;!WoV_kt>z^;TpGyRDpiv z{V)?s_WT*{S$(fpya-t=$=7+Q?lXBah81vW0_GbZ*ll8W(;!2@__vv(MV`eeu~RUYoN0UnZXN$jEwvlzGzLh84W(L3p+vh+ ziI9KEv2t80iNR7^hLj=xeNg{=y^TwpW*r@RVd_#{Jc>6)aY=Id+P3p^xN2%x=nTtX zN7nYjmFispxP2uTZ|T^9_JeJYaH0x(&ldBy&Ax<8|4vEX!IY*&907CHfRNAJSemz5 zJK;?cM)x5a4}3h^cAz~7We<-$Y8Jtv9@QTG-nMf~@g_^sJbbNk=moY}~9DH0| zpuOQjyG}y&5eDYA4OK1OEise%XKdwkCR**O7gS!@4%Gcqe5qt0o~@ZtMGQXqZqF#6 zzghI=rV+aLz077&t&#P(mv_aedfCB7Y_zA$X%C5Mn882f;e#`f(laaEtS%Mvl=!u= z%&ts+2TUtS<7#j@%|BMSlg*4(L)^^oO+&1U37)ZIUL;2(nH~O{!R-ZXsRpaCWK_8AR0M(#i+yiI#D4d0pT32PVajc;tcyD1TN$~fZ#o}Ou1yXL&Rq5}!J1`;) z+MMlZpEZfzXKvvC?eezwJ4y#ySlF6-+9J?J@=K|7z;e^?r7<<)6FVAzj3EHs6KdJ> zSfbTCYBE=?D5EAdr?7m)NPNa4{SOa>xpzc@u0?(q2z?`-m#^Bw1F!peuM*aY!r}WL zP#JJfirWqVh0}#@-iCe3AJ(#D!^f*IR88L<9ivv4&6lr3KpPx# literal 0 HcmV?d00001 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5b85dcfe9..6d737a404 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -37,5 +37,13 @@ jobs: env: PUB_CREDENTIALS_KEY: ${{ secrets.PUB_CREDENTIALS_KEY }} + - name: Decrypt Git SSH credentials + run: ./script/decrypt.sh "$GIT_CREDENTIALS_KEY" ./.github/keys/deploy_key_rsa.gpg ./deploy_key_rsa + env: + GIT_CREDENTIALS_KEY: ${{ secrets.GIT_CREDENTIALS_KEY }} + - name: Publish to Pub run: ./gradlew publish -x test --stacktrace + env: + FORMAL_GIT_HUB_PAGES_AUTHOR: developers@spine.io + TRAVIS_REPO_SLUG: $GITHUB_REPOSITORY From bfef04de4664f88a7c20b5738268304d67cdba79 Mon Sep 17 00:00:00 2001 From: "dmitry.kashcheiev" Date: Mon, 27 Jun 2022 17:09:52 +0300 Subject: [PATCH 8/8] Fix docs genearation to generate all docs instead of pure README.md. --- client/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/build.gradle.kts b/client/build.gradle.kts index fa923c562..10d2a53e1 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -67,7 +67,7 @@ tasks.assemble { val dartDocDir = Files.createTempDir() val dartDoc by tasks.creating(Exec::class) { - commandLine("dart", "doc", "--output", dartDocDir.path, "$projectDir/lib/") + commandLine("dart", "doc", "--output", dartDocDir.path) } afterEvaluate {