Skip to content

Commit 5be8a1c

Browse files
committed
Rename setup_sqlcipher.sh as prepare_release.sh
1 parent 404696a commit 5be8a1c

File tree

3 files changed

+24
-9
lines changed

3 files changed

+24
-9
lines changed

.github/README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,15 @@ Update upstream's master branch if needed:
3131

3232
* `git pull upstream master`
3333

34+
Switch back to the `SQLCipher` branch and merge with upstream-master:
35+
36+
* `git merge upstream-master`
37+
3438
Resolve any conflicts that may occur (normally there should be none or only in Package.swift)
35-
and commit the merge. Once done, run `setup_sqlcipher.sh` script to fetch and compile the latest tag
39+
and commit the merge. Once done, run `prepare_release.sh` script to fetch and compile the latest tag
3640
of SQLCipher and embed it in GRDB.swift:
3741

38-
* `./setup_sqlcipher.sh`
42+
* `./prepare_release.sh`
3943

4044
The script will also:
4145
* present the summary of updated versions and ask you to pick the new version number for DuckDuckGo GRDB fork,
@@ -58,7 +62,7 @@ Once merged, tag the branch with a version picked earlier and push the tag.
5862

5963
# Compiling SQLCipher manually
6064

61-
In case `setup_sqlcipher.sh` script fails, you need to compile SQLCipher amalgamation package
65+
In case `prepare_release.sh` script fails, you need to compile SQLCipher amalgamation package
6266
manually. See [general instructions](https://github.com/sqlcipher/sqlcipher#compiling-for-unix-like-systems):
6367

6468
* Use `./configure --with-crypto-lib=none`.

.github/README.md.in

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,15 @@ Update upstream's master branch if needed:
3131

3232
* `git pull upstream master`
3333

34+
Switch back to the `SQLCipher` branch and merge with upstream-master:
35+
36+
* `git merge upstream-master`
37+
3438
Resolve any conflicts that may occur (normally there should be none or only in Package.swift)
35-
and commit the merge. Once done, run `setup_sqlcipher.sh` script to fetch and compile the latest tag
39+
and commit the merge. Once done, run `prepare_release.sh` script to fetch and compile the latest tag
3640
of SQLCipher and embed it in GRDB.swift:
3741

38-
* `./setup_sqlcipher.sh`
42+
* `./prepare_release.sh`
3943

4044
The script will also:
4145
* present the summary of updated versions and ask you to pick the new version number for DuckDuckGo GRDB fork,
@@ -58,7 +62,7 @@ Once merged, tag the branch with a version picked earlier and push the tag.
5862

5963
### Compiling SQLCipher manually
6064

61-
In case `setup_sqlcipher.sh` script fails, you need to compile SQLCipher amalgamation package
65+
In case `prepare_release.sh` script fails, you need to compile SQLCipher amalgamation package
6266
manually. See [general instructions](https://github.com/sqlcipher/sqlcipher#compiling-for-unix-like-systems):
6367

6468
* Use `./configure --with-crypto-lib=none`.

setup_sqlcipher.sh renamed to prepare_release.sh

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,11 @@ build_release() {
9292
rm -rf "${cwd}/.build"
9393
swift build -c release
9494

95-
echo "SQLCipher ${sqlcipher_tag} is ready to use with GRDB.swift ${grdb_tag} 🎉"
95+
cat <<- EOF
96+
97+
SQLCipher ${sqlcipher_tag} is ready to use with GRDB.swift ${grdb_tag} 🎉
98+
99+
EOF
96100
}
97101

98102
setup_new_release_branch() {
@@ -103,8 +107,11 @@ setup_new_release_branch() {
103107
git checkout -b "$release_branch"
104108
git commit -a -m "DuckDuckGo GRDB.swift ${new_version} (GRDB ${upstream-version}, SQLCipher ${sqlcipher_version})"
105109

106-
echo "Release is prepared on branch ${release_branch}."
107-
echo "Push the branch when ready and follow .github/README.md for release instructions."
110+
cat <<- EOF
111+
112+
Release is prepared on branch ${release_branch}.
113+
Push the branch when ready and follow .github/README.md for release instructions.
114+
EOF
108115
}
109116

110117
main() {

0 commit comments

Comments
 (0)