Skip to content

Commit c973881

Browse files
authored
Merge branch 'main' into maciekbanas/81/prepare-mocks-for-testing-vectordatabase
2 parents b6fdc4b + 15d4abb commit c973881

File tree

2 files changed

+171
-10
lines changed

2 files changed

+171
-10
lines changed

.github/workflows/version.yaml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: ⬆️ Check Version Bump
2+
3+
on:
4+
pull_request:
5+
branches: [main]
6+
7+
jobs:
8+
check-version:
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- name: Checkout source branch
13+
uses: actions/checkout@v2
14+
with:
15+
ref: ${{ github.event.pull_request.head.sha }}
16+
path: source
17+
18+
- name: Checkout target branch
19+
uses: actions/checkout@v2
20+
with:
21+
ref: ${{ github.event.pull_request.base.sha }}
22+
path: target
23+
24+
- name: Compare versions
25+
id: compare_versions
26+
run: |
27+
SOURCE_VERSION=$(awk '/^Version:/ { print $2 }' source/DESCRIPTION)
28+
TARGET_VERSION=$(awk '/^Version:/ { print $2 }' target/DESCRIPTION)
29+
echo "Source package version: $SOURCE_VERSION"
30+
echo "Target package version: $TARGET_VERSION"
31+
32+
if [ "$SOURCE_VERSION" == "$TARGET_VERSION" ]; then
33+
echo "Versions are identical"
34+
echo "::set-output name=versions_identical::true"
35+
else
36+
echo "Versions differ"
37+
echo "::set-output name=versions_identical::false"
38+
fi
39+
40+
- name: Fail if versions are identical
41+
if: steps.compare_versions.outputs.versions_identical == 'true'
42+
run: |
43+
echo "The package versions are identical between the source and target branches."
44+
exit 1

renv.lock

Lines changed: 127 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,17 @@
3838
],
3939
"Hash": "470851b6d5d0ac559e9d01bb352b4021"
4040
},
41+
"Rcpp": {
42+
"Package": "Rcpp",
43+
"Version": "1.0.13-1",
44+
"Source": "Repository",
45+
"Repository": "CRAN",
46+
"Requirements": [
47+
"methods",
48+
"utils"
49+
],
50+
"Hash": "6b868847b365672d6c1677b1608da9ed"
51+
},
4152
"S7": {
4253
"Package": "S7",
4354
"Version": "0.2.0",
@@ -136,6 +147,13 @@
136147
],
137148
"Hash": "b21916dd77a27642b447374a5d30ecf3"
138149
},
150+
"commonmark": {
151+
"Package": "commonmark",
152+
"Version": "1.9.2",
153+
"Source": "Repository",
154+
"Repository": "CRAN",
155+
"Hash": "14eb0596f987c71535d07c3aff814742"
156+
},
139157
"coro": {
140158
"Package": "coro",
141159
"Version": "1.1.0",
@@ -281,7 +299,7 @@
281299
"jsonlite",
282300
"rlang"
283301
],
284-
"Hash": "b88717af28296eff2bc8f6f7f474ef1a"
302+
"Hash": "7b6008b2091a6d4a93b8e57bef424449"
285303
},
286304
"evaluate": {
287305
"Package": "evaluate",
@@ -384,16 +402,26 @@
384402
],
385403
"Hash": "81d371a9cc60640e74e4ab6ac46dcedc"
386404
},
405+
"httpuv": {
406+
"Package": "httpuv",
407+
"Version": "1.6.15",
408+
"Source": "Repository",
409+
"Repository": "CRAN",
410+
"Requirements": [
411+
"R",
412+
"R6",
413+
"Rcpp",
414+
"later",
415+
"promises",
416+
"utils"
417+
],
418+
"Hash": "d55aa087c47a63ead0f6fc10f8fa1ee0"
419+
},
387420
"httr2": {
388421
"Package": "httr2",
389-
"Version": "1.0.6.9000",
390-
"Source": "GitHub",
391-
"RemoteType": "github",
392-
"RemoteHost": "api.github.com",
393-
"RemoteRepo": "httr2",
394-
"RemoteUsername": "r-lib",
395-
"RemotePkgRef": "r-lib/httr2",
396-
"RemoteSha": "651665d811e8f88d55c472dae50f3116aaf3da32",
422+
"Version": "1.0.7",
423+
"Source": "Repository",
424+
"Repository": "CRAN",
397425
"Requirements": [
398426
"R",
399427
"R6",
@@ -408,7 +436,7 @@
408436
"vctrs",
409437
"withr"
410438
],
411-
"Hash": "66c98064fcefeac59159ba0d69e9bb8f"
439+
"Hash": "5a76da345ed4f3e6430517e08441edaf"
412440
},
413441
"jquerylib": {
414442
"Package": "jquerylib",
@@ -446,6 +474,17 @@
446474
],
447475
"Hash": "9fcb189926d93c636dea94fbe4f44480"
448476
},
477+
"later": {
478+
"Package": "later",
479+
"Version": "1.3.2",
480+
"Source": "Repository",
481+
"Repository": "CRAN",
482+
"Requirements": [
483+
"Rcpp",
484+
"rlang"
485+
],
486+
"Hash": "a3e051d405326b8b0012377434c62b37"
487+
},
449488
"lifecycle": {
450489
"Package": "lifecycle",
451490
"Version": "1.0.4",
@@ -627,6 +666,22 @@
627666
],
628667
"Hash": "0c90a7d71988856bad2a2a45dd871bb9"
629668
},
669+
"promises": {
670+
"Package": "promises",
671+
"Version": "1.3.0",
672+
"Source": "Repository",
673+
"Repository": "CRAN",
674+
"Requirements": [
675+
"R6",
676+
"Rcpp",
677+
"fastmap",
678+
"later",
679+
"magrittr",
680+
"rlang",
681+
"stats"
682+
],
683+
"Hash": "434cd5388a3979e74be5c219bcd6e77d"
684+
},
630685
"ps": {
631686
"Package": "ps",
632687
"Version": "1.8.1",
@@ -728,6 +783,13 @@
728783
],
729784
"Hash": "4c8415e0ec1e29f3f4f6fc108bef0144"
730785
},
786+
"rstudioapi": {
787+
"Package": "rstudioapi",
788+
"Version": "0.17.1",
789+
"Source": "Repository",
790+
"Repository": "CRAN",
791+
"Hash": "5f90cd73946d706cfe26024294236113"
792+
},
731793
"sass": {
732794
"Package": "sass",
733795
"Version": "0.4.9",
@@ -742,6 +804,49 @@
742804
],
743805
"Hash": "d53dbfddf695303ea4ad66f86e99b95d"
744806
},
807+
"shiny": {
808+
"Package": "shiny",
809+
"Version": "1.9.1",
810+
"Source": "Repository",
811+
"Repository": "CRAN",
812+
"Requirements": [
813+
"R",
814+
"R6",
815+
"bslib",
816+
"cachem",
817+
"commonmark",
818+
"crayon",
819+
"fastmap",
820+
"fontawesome",
821+
"glue",
822+
"grDevices",
823+
"htmltools",
824+
"httpuv",
825+
"jsonlite",
826+
"later",
827+
"lifecycle",
828+
"methods",
829+
"mime",
830+
"promises",
831+
"rlang",
832+
"sourcetools",
833+
"tools",
834+
"utils",
835+
"withr",
836+
"xtable"
837+
],
838+
"Hash": "6a293995a66e12c48d13aa1f957d09c7"
839+
},
840+
"sourcetools": {
841+
"Package": "sourcetools",
842+
"Version": "0.1.7-1",
843+
"Source": "Repository",
844+
"Repository": "CRAN",
845+
"Requirements": [
846+
"R"
847+
],
848+
"Hash": "5f5a7629f956619d519205ec475fe647"
849+
},
745850
"stringi": {
746851
"Package": "stringi",
747852
"Version": "1.8.4",
@@ -973,6 +1078,18 @@
9731078
],
9741079
"Hash": "1d0336142f4cd25d8d23cd3ba7a8fb61"
9751080
},
1081+
"xtable": {
1082+
"Package": "xtable",
1083+
"Version": "1.8-4",
1084+
"Source": "Repository",
1085+
"Repository": "CRAN",
1086+
"Requirements": [
1087+
"R",
1088+
"stats",
1089+
"utils"
1090+
],
1091+
"Hash": "b8acdf8af494d9ec19ccb2481a9b11c2"
1092+
},
9761093
"yaml": {
9771094
"Package": "yaml",
9781095
"Version": "2.3.10",

0 commit comments

Comments
 (0)