Skip to content

Commit

Permalink
Merge pull request #2 from KAMAELUA/conflict
Browse files Browse the repository at this point in the history
ci: merge ci update
  • Loading branch information
KAMAELUA authored Jan 23, 2024
2 parents 7b82143 + 365a60e commit fcd38ba
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ jobs:
run: |
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
read next latest <<< $(npm info tedious --json | jq -r '."dist-tags".next, ."dist-tags".latest')
read next latest <<< $(npm info tedious-decimal --json | jq -r '."dist-tags".next, ."dist-tags".latest')
if [ "$(printf '%s\n' "$latest" "$next" | sort -V | tail -n 1)" != "$latest" ]; then
date_format="%Y-%m-%dT%H:%M:%SZ"
publish_date=$(date -d $(npm info tedious --json | jq -r '.time["'"$next"'"]') +$date_format)
publish_date=$(date -d $(npm info tedious-decimal --json | jq -r '.time["'"$next"'"]') +$date_format)
week_ago=$(date -d '-7 days' +$date_format)
if [[ "$publish_date" < "$week_ago" || "$publish_date" == "$week_ago" ]]; then
npm dist-tag add "tedious@$next" latest
npm dist-tag add "tedious-decimal@$next" latest
fi
fi
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ See the [changelog](https://github.com/tediousjs/tedious/releases) for version h

Node.js is a prerequisite for installing tedious. Once you have installed [Node.js](https://nodejs.org/), installing tedious is simple:

npm install tedious
npm install tedious-decimal

## Getting Started
- [Node.js + macOS](https://www.microsoft.com/en-us/sql-server/developer-get-started/node/mac/)
Expand Down

0 comments on commit fcd38ba

Please sign in to comment.