Skip to content

Commit

Permalink
chore: merge release-v0.2.3 into main
Browse files Browse the repository at this point in the history
  • Loading branch information
mrjackwills committed Oct 19, 2024
2 parents 606b88d + 8211937 commit 651e18c
Show file tree
Hide file tree
Showing 10 changed files with 638 additions and 311 deletions.
3 changes: 2 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@
"vscode": {
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"bungcip.better-toml",
"christian-kohler.path-intellisense",
"dbaeumer.vscode-eslint",
"fill-labs.dependi",
"gruntfuggly.todo-tree",
"foxundermoon.shell-format",
"meganrogge.template-string-converter",
"mutantdino.resourcemonitor",
"tamasfe.even-better-toml",
"timonwong.shellcheck",
"redhat.vscode-yaml",
"vue.volar",
Expand Down
9 changes: 8 additions & 1 deletion .eslintrc-auto-import.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,13 @@
"ExtractDefaultPropTypes": true,
"ExtractPropTypes": true,
"ExtractPublicPropTypes": true,
"WritableComputedRef": true
"WritableComputedRef": true,
"DirectiveBinding": true,
"MaybeRef": true,
"MaybeRefOrGetter": true,
"onWatcherCleanup": true,
"useId": true,
"useModel": true,
"useTemplateRef": true
}
}
12 changes: 5 additions & 7 deletions .github/release-body.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
### 2024-09-06
### 2024-10-19

### Chores
+ dependencies updated, [6ec2d8837681099be72f5ab5df69f0416706da6c], [a4d2ab3b216b5128a6f12f64ad214b285df8701d]
+ GitHub action dependency updated, [35445a802ae5b5a78a84694c5f4f339020c6e2a8]

### Docs
+ screenshot updated, [a26139fb72058ef74519c859f720b3bb10b93e55], [361da9695c8a29f624f4bc83087c8ab63c8baa21]
+ create_release.sh, [a41a54539a0fbab769f1bc8700d597a8da0a7693]
+ .devcontainer updated, [813d360cc93dc1a4d31fe034ecb291f97bc6c2f2]
+ dependencies updated, [c4348f7f0d884fff635c186f50857858be28d041]

### Fixes
+ no flights text colour, [98e2ff53747672cb32f96f05591adc32cf9181fe]
+ vite.config css, [8af95e4d4e06084ba859a3a88e22875da8013928]

see <a href='https://github.com/mrjackwills/flightbox_vue/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# <a href='https://github.com/mrjackwills/flightbox_vue/releases/tag/v0.2.3'>v0.2.3</a>
### 2024-10-19

### Chores
+ create_release.sh, [a41a5453](https://github.com/mrjackwills/flightbox_vue/commit/a41a54539a0fbab769f1bc8700d597a8da0a7693)
+ .devcontainer updated, [813d360c](https://github.com/mrjackwills/flightbox_vue/commit/813d360cc93dc1a4d31fe034ecb291f97bc6c2f2)
+ dependencies updated, [c4348f7f](https://github.com/mrjackwills/flightbox_vue/commit/c4348f7f0d884fff635c186f50857858be28d041)

### Fixes
+ vite.config css, [8af95e4d](https://github.com/mrjackwills/flightbox_vue/commit/8af95e4d4e06084ba859a3a88e22875da8013928)

# <a href='https://github.com/mrjackwills/flightbox_vue/releases/tag/v0.2.2'>v0.2.2</a>
### 2024-09-06

Expand Down
31 changes: 17 additions & 14 deletions create_release.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash

# release_vue v0.2.5
# release_vue v0.3.0
# 2024-10-19

# Colours for echo
RED='\033[0;31m'
Expand All @@ -26,23 +27,27 @@ if ! [ -x "$(command -v dialog)" ]; then
fi

# $1 string - question to ask
ask_yn () {
printf "%b%s? [y/N]:%b " "${GREEN}" "$1" "${RESET}"
# Ask a yes no question, only accepts `y` or `n` as a valid answer, returns 0 for yes, 1 for no
ask_yn() {
while true; do
printf "\n%b%s? [y/N]:%b " "${GREEN}" "$1" "${RESET}"
read -r answer
if [[ "$answer" == "y" ]]; then
return 0
elif [[ "$answer" == "n" ]]; then
return 1
else
echo -e "${RED}\nPlease enter 'y' or 'n'${RESET}"
fi
done
}

ask_continue() {
ask_yn "continue"
if [[ ! "$(user_input)" =~ ^y$ ]]; then
if ! ask_yn "continue";then
exit
fi
}

# return user input
user_input() {
read -r data
echo "$data"
}

# semver major update
update_major() {
local bumped_major
Expand Down Expand Up @@ -89,9 +94,7 @@ ask_changelog_update() {
RELEASE_BODY_TEXT=$(sed '/# <a href=/Q' CHANGELOG.md)
printf "%s" "$RELEASE_BODY_TEXT"
printf "\n%s\n" "${STAR_LINE}"
ask_yn "accept release body"
if [[ "$(user_input)" =~ ^y$ ]]
then
if ask_yn "accept release body"; then
update_release_body_and_changelog "$RELEASE_BODY_TEXT"
else
exit
Expand Down
Loading

0 comments on commit 651e18c

Please sign in to comment.