Skip to content

Commit 12f71ff

Browse files
committed
chore(release): release v2.1.0
- merged from branch 'develop' Signed-off-by: Vedant K <gamemaker0042@gmail.com>
2 parents db5b986 + 8bcc133 commit 12f71ff

18 files changed

+263
-293
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
run: |
2828
npm ci
2929
npm test
30+
3031
# Build the executable
3132
build:
3233
name: Build executable (alpine, linux, macos, win) (node ${{ matrix.node_version }})
@@ -114,9 +115,9 @@ jobs:
114115
if: ${{ steps.check-version.outputs.version != steps.check-version.outputs.previous_version }}
115116
uses: softprops/action-gh-release@v1
116117
with:
117-
body_path: RELEASE-NOTES.md
118+
body_path: release-notes.md
118119
tag_name: ${{ steps.check-version.outputs.version }}
119-
prerelease: contains(steps.check-version.outputs.version, '-')
120+
prerelease: ${{ contains(steps.check-version.outputs.version, '-') }}
120121
name: Dabbu Files API Server ${{ steps.check-version.outputs.version }}
121122
files: |
122123
files-api-server-alpine

CHANGELOG.md

Lines changed: 0 additions & 31 deletions
This file was deleted.

RELEASE-NOTES.md

Lines changed: 0 additions & 67 deletions
This file was deleted.
File renamed without changes.

LICENSE.md renamed to license.md

File renamed without changes.

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dabbu-files-api-server",
3-
"version": "2.0.0",
3+
"version": "2.1.0",
44
"description": "An implementation of the Dabbu Files API that enables you to access your files, folders and emails stored with multiple providers as simple files and folders, all in one place!",
55
"main": "src/index.js",
66
"scripts": {

README.md renamed to readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ _And more to come...!_
4545

4646
If you want to create a new provider, please file an issue using the `New provider` template [here](https://github.com/dabbu-knowledge-platform/files-api-server/issues/new/choose). This is only to let us know that you want to work on the provider and how you plan to go about it.
4747

48-
Please read [CONTRIBUTING.md](./CONTRIBUTING.md) for a detailed guide to setting up your environment and making changes to the code.
48+
Please read [contributing](./contributing) for a detailed guide to setting up your environment and making changes to the code.
4949

5050
Also, if you need any help on the code, please do ask on [this](https://github.com/dabbu-knowledge-platform/files-api-server/discussions/categories/want-to-contribute) Github discussion. We will only be glad to help :)
5151

@@ -57,7 +57,7 @@ The documentation for the server can be found on the [website](https://dabbu-kno
5757

5858
You can contribute to Dabbu by reporting bugs, fixing bugs, adding features, and spreading the word! If you want to report a bug, create an issue by clicking [here](https://github.com/dabbu-knowledge-platform/files-api-server/issues/new/choose). While creating an issue, try to follow the Bug report or Feature request template.
5959

60-
Please read [CONTRIBUTING.md](./CONTRIBUTING.md) for a detailed guide to setting up your environment and making changes to the code.
60+
Please read [contributing](./contributing) for a detailed guide to setting up your environment and making changes to the code.
6161

6262
## Legal stuff
6363

release-notes.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
## Features added
2+
3+
- feat(list api): implement pagination [601bd83]
4+
- all providers (except hard drive) now return a nextSetToken in
5+
the response
6+
- the maximum number of results at once is 50, can be changed using
7+
the limit query parameter (recommended is default, 50)
8+
- they also accept a nextSetToken in the query parameters to get
9+
results from a certain point
10+
- fix(arg parsing): cast port to integer if specified [2a22d3e]
11+
12+
## Provider specific changes
13+
14+
### Gmail
15+
16+
- feat(gmail): add ability to list all mail using ALL_MAIL label [f6950f3]
17+
18+
## Builds/CI
19+
20+
- fix(scripts): copy bump version script from cli repo [f8f8a67]
21+
- ci: change method for detecting prereleases [cff5bc0]
22+
- delete CHANGELOG.md, as it is no longer used
23+
24+
- style: rename readme, contributing, release notes to have .md ext [7afd270]
25+
- style: rename readme, contributing, release notes to lower case [d7c3867]

scripts/bump-version

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,30 @@
77
#
88
# Remember to run this script from the root of the project!
99

10-
# Import colours to colourise the output
11-
SCRIPT_DIR=$(dirname "$0")
12-
source "$SCRIPT_DIR/colours"
10+
# ANSI colour codes so we can highlight text in the terminal
11+
colour_black="\033[0;30m"
12+
colour_darkgray="\033[1;30m"
13+
colour_red="\033[0;31m"
14+
colour_lightred="\033[1;31m"
15+
colour_green="\033[0;32m"
16+
colour_lightgreen="\033[1;32m"
17+
colour_orange="\033[0;33m"
18+
colour_yellow="\033[1;33m"
19+
colour_blue="\033[0;34m"
20+
colour_lightblue="\033[1;34m"
21+
colour_purple="\033[0;35m"
22+
colour_lightpurple="\033[1;35m"
23+
colour_cyan="\033[0;36m"
24+
colour_lightcyan="\033[1;36m"
25+
colour_lightgray="0;\033[37 m"
26+
colour_white="\033[1;37m"
27+
28+
# Escape codes for making text bold, italic, etc.
29+
bold="\e[1m"
30+
italic="\e[3m"
31+
underline="\e[4"
32+
strikethrough="\e[9"
33+
normal="\e[0m"
1334

1435
# Display a help message
1536
function help {
@@ -68,35 +89,39 @@ function add_release_notes {
6889
# Get the commit that was tagged as the last version
6990
local previous_tag_revision=`git rev-list --tags --max-count=1`
7091

71-
# Add all commit details since the last tagged commit into RELEASE-NOTES.tmp
72-
git log --format="%s [%h]%n%b" $previous_tag_revision..HEAD > RELEASE-NOTES.tmp
92+
# Add all commit details since the last tagged commit into release-notes.tmp
93+
git log --format="%s [%h]%n%b" $previous_tag_revision..HEAD > release-notes.tmp
7394

7495
# Remove Signed-off-by and Co-authored-by lines from the details
75-
sed -i '/^Signed-off-by/d' RELEASE-NOTES.tmp
76-
sed -i '/^Co-authored-by/d' RELEASE-NOTES.tmp
77-
# Remove double newlines and save that as RELEASE-NOTES.md
78-
cat -s RELEASE-NOTES.tmp > RELEASE-NOTES.md
96+
sed -i "/^Signed-off-by/d" release-notes.tmp
97+
sed -i "/^Co-authored-by/d" release-notes.tmp
98+
# Remove double newlines and save that as release-notes
99+
cat -s release-notes.tmp > release-notes.md
79100
# Delete the temporary file
80-
rm RELEASE-NOTES.tmp
101+
rm release-notes.tmp
81102

82103
# Open the release notes in an editor for the user to edit
83-
$EDITOR RELEASE-NOTES.md
104+
$EDITOR release-notes.md
84105
}
85106

86107
# Push a new version to github
87108
function push_to_git {
88109
# Get the new version
89110
local new_release_tag=`cat version`
90111
# Add the changed files
91-
git add version package.json package-lock.json RELEASE-NOTES.md
112+
git add version package.json package-lock.json release-notes.md
92113

93114
# Commit it as a prerelease or a release
115+
# NOTE: Do not tag the commit, as the CI will then not create a release
94116
# Pre-releases will contain a dash in their version
95117
if [[ $new_release_tag =~ "-" ]]; then
96-
git commit -m "chore(release): prerelease $new_release_tag"
118+
git commit --signoff -m "chore(release): prerelease $new_release_tag"
97119
else
98-
git commit -m "chore(release): release $new_release_tag"
120+
git commit --signoff -m "chore(release): release $new_release_tag"
99121
fi
122+
123+
# Push the changes
124+
git push
100125
}
101126

102127
# Main function

0 commit comments

Comments
 (0)