Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update from upstream #3

Merged
merged 60 commits into from
May 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
3cc9b3f
build(deps): bump docker/build-push-action from 3 to 5 (#580)
dependabot[bot] Feb 12, 2024
2dbe02d
build(deps): bump actions/setup-node from 3 to 4 (#579)
dependabot[bot] Feb 12, 2024
b1e3dc5
build(deps): bump peter-evans/repository-dispatch from 1 to 3 (#578)
dependabot[bot] Feb 12, 2024
b13c3f6
build(deps-dev): bump @types/node from 17.0.45 to 20.11.17 (#574)
dependabot[bot] Feb 12, 2024
5d6e67a
build(deps-dev): bump eslint from 8.47.0 to 8.56.0 (#577)
dependabot[bot] Feb 12, 2024
72452e4
build(deps-dev): bump semantic-release from 21.0.7 to 23.0.2 (#575)
dependabot[bot] Feb 12, 2024
c3407cd
feat(node): Upgrade to Node 20 (#581)
bagelbits Feb 12, 2024
922f87d
fix(deploy): Fix Semantic release deployment (#582)
bagelbits Feb 12, 2024
3eb6886
fix(ci): Bump ci node versions as well (#583)
bagelbits Feb 12, 2024
edb44a9
fix(ci): revert action version (#584)
bagelbits Feb 12, 2024
e9f769d
fix(git): Empty commit to remake version 3.3.1
bagelbits Feb 12, 2024
1339490
fix(ci): Upgrade to v4 correctly for Semantic Release action (#585)
bagelbits Feb 12, 2024
602ce9f
fix(ci): Revert "fix(ci): Upgrade to v4 correctly for Semantic Releas…
bagelbits Feb 12, 2024
47f6463
build(deps-dev): bump @typescript-eslint/eslint-plugin from 5.62.0 to…
dependabot[bot] Feb 12, 2024
2bb0c64
build(deps-dev): bump @types/node from 20.11.17 to 20.11.19 (#586)
dependabot[bot] Feb 20, 2024
9a14929
build(deps-dev): bump @typescript-eslint/eslint-plugin from 6.21.0 to…
dependabot[bot] Feb 20, 2024
c6932ef
build(deps-dev): bump eslint from 8.56.0 to 8.57.0 (#592)
dependabot[bot] Feb 26, 2024
1df8339
build(deps-dev): bump @types/node from 20.11.19 to 20.11.20 (#591)
dependabot[bot] Feb 26, 2024
c138b7e
build(deps-dev): bump @types/node from 20.11.20 to 20.11.24 (#594)
dependabot[bot] Mar 4, 2024
1e7fa28
fix: Normalize resistance/immunity/vulnerability strings (#561)
ASTRELION Mar 4, 2024
e735678
build(deps-dev): bump @typescript-eslint/parser from 6.21.0 to 7.1.1 …
dependabot[bot] Mar 4, 2024
b8e8a3c
build(deps-dev): bump @types/node from 20.11.24 to 20.11.25 (#596)
dependabot[bot] Mar 11, 2024
840aa87
build(deps-dev): bump typescript from 5.3.3 to 5.4.2 (#597)
dependabot[bot] Mar 11, 2024
3e6ce8e
fix(5e-SRD-Monsters.json): small inconsistencies (#598)
breni-tiber Mar 15, 2024
47d836a
build(deps-dev): bump @typescript-eslint/eslint-plugin from 7.1.1 to …
dependabot[bot] Mar 18, 2024
ffd9c33
build(deps-dev): bump @typescript-eslint/parser from 7.1.1 to 7.2.0 (…
dependabot[bot] Mar 18, 2024
48242a1
build(deps-dev): bump @types/node from 20.11.25 to 20.11.28 (#602)
dependabot[bot] Mar 18, 2024
02ed31c
build(deps-dev): bump semantic-release from 23.0.2 to 23.0.5 (#604)
dependabot[bot] Mar 18, 2024
fc70b15
build(deps-dev): bump @semantic-release/github from 9.2.6 to 10.0.2 (…
dependabot[bot] Mar 18, 2024
e4d0da0
build(deps-dev): bump semantic-release from 23.0.5 to 23.0.6 (#607)
dependabot[bot] Mar 25, 2024
5a06be8
build(deps-dev): bump @typescript-eslint/eslint-plugin from 7.2.0 to …
dependabot[bot] Mar 25, 2024
56c2c59
build(deps-dev): bump typescript from 5.4.2 to 5.4.3 (#606)
dependabot[bot] Mar 25, 2024
94b45e1
build(deps-dev): bump @typescript-eslint/parser from 7.2.0 to 7.3.1 (…
dependabot[bot] Mar 25, 2024
9f0c1ee
build(deps-dev): bump @types/node from 20.11.28 to 20.11.30 (#609)
dependabot[bot] Mar 25, 2024
f56f913
build(deps-dev): bump @typescript-eslint/parser from 7.3.1 to 7.4.0 (…
dependabot[bot] Apr 1, 2024
7123601
build(deps-dev): bump @types/node from 20.11.30 to 20.12.2 (#613)
dependabot[bot] Apr 1, 2024
643d474
build(deps-dev): bump glob from 10.3.10 to 10.3.12 (#614)
dependabot[bot] Apr 1, 2024
587657c
build(deps-dev): bump @typescript-eslint/eslint-plugin from 7.3.1 to …
dependabot[bot] Apr 1, 2024
4763325
build(deps-dev): bump @typescript-eslint/parser from 7.4.0 to 7.5.0 (…
dependabot[bot] Apr 9, 2024
5c88359
build(deps-dev): bump semantic-release from 23.0.6 to 23.0.7 (#616)
dependabot[bot] Apr 9, 2024
7c4f386
build(deps-dev): bump @types/node from 20.12.2 to 20.12.5 (#617)
dependabot[bot] Apr 9, 2024
3bb6e4e
build(deps-dev): bump typescript from 5.4.3 to 5.4.4 (#619)
dependabot[bot] Apr 9, 2024
b21a2a6
build(deps-dev): bump @semantic-release/github from 10.0.2 to 10.0.3 …
dependabot[bot] Apr 9, 2024
b9cae18
build(deps-dev): bump @types/node from 20.12.5 to 20.12.6 (#620)
dependabot[bot] Apr 9, 2024
ad31ec7
build(deps-dev): bump @typescript-eslint/parser from 7.5.0 to 7.6.0 (…
dependabot[bot] Apr 15, 2024
7cf0275
build(deps-dev): bump @types/node from 20.12.6 to 20.12.7 (#623)
dependabot[bot] Apr 16, 2024
2652a85
build(deps-dev): bump typescript from 5.4.4 to 5.4.5 (#624)
dependabot[bot] Apr 16, 2024
50461d3
build(deps-dev): bump semantic-release from 23.0.7 to 23.0.8 (#625)
dependabot[bot] Apr 16, 2024
d6d8c3b
build(deps-dev): bump @typescript-eslint/eslint-plugin from 7.4.0 to …
dependabot[bot] Apr 17, 2024
664d944
build(deps-dev): bump @typescript-eslint/parser from 7.6.0 to 7.7.0 (…
dependabot[bot] Apr 23, 2024
1c8bd23
build(deps): bump cycjimmy/semantic-release-action from 3 to 4 (#589)
dependabot[bot] Apr 28, 2024
de70014
build(deps-dev): bump @typescript-eslint/parser from 7.7.0 to 7.7.1 (…
dependabot[bot] Apr 29, 2024
abe2109
build(deps-dev): bump @typescript-eslint/eslint-plugin from 7.7.0 to …
dependabot[bot] Apr 29, 2024
2ca6e3c
fix(monsters): Change burrow speed for young-blue-dragon to 20 ft. (f…
andrew-collett Apr 29, 2024
12fd554
build(deps-dev): bump @types/node from 20.12.7 to 20.12.8 (#633)
dependabot[bot] May 6, 2024
3541a3b
build(deps-dev): bump @typescript-eslint/parser from 7.7.1 to 7.8.0 (…
dependabot[bot] May 6, 2024
28b92cf
feat(monsters): Add images for ancient, adult, and young dragons (#635)
bagelbits May 12, 2024
6596bd9
build(deps-dev): bump semantic-release from 23.0.8 to 23.1.1 (#637)
dependabot[bot] May 13, 2024
e72056c
build(deps-dev): bump glob from 10.3.12 to 10.3.15 (#638)
dependabot[bot] May 13, 2024
a557a30
build(deps-dev): bump @types/node from 20.12.8 to 20.12.11 (#639)
dependabot[bot] May 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
push:
branches: [main]
tags:
- 'v*'
- "v*"
pull_request:
branches: [main]

Expand All @@ -17,10 +17,10 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- name: Use Node.js 18.x
uses: actions/setup-node@v3
- name: Use Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 20.x
- run: npm install
- run: npm run lint

Expand All @@ -29,10 +29,10 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- name: Use Node.js 18.x
uses: actions/setup-node@v3
- name: Use Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 20.x
- run: npm install
- run: npm run test

Expand All @@ -43,10 +43,10 @@ jobs:
if: ${{ github.event_name != 'pull_request' && github.repository == '5e-bits/5e-database' }}
steps:
- uses: actions/checkout@v4
- name: Use Node.js 18.x
uses: actions/setup-node@v3
- name: Use Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 20.x
- name: Refresh DB contents
env:
MONGODB_URI: ${{ secrets.MONGODB_URI }}
Expand Down Expand Up @@ -94,13 +94,12 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push Docker image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ needs.github-release.outputs.version }},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
labels:
version=${{ needs.github-release.outputs.version }}
labels: version=${{ needs.github-release.outputs.version }}

trigger_downstream:
name: Trigger downstream
Expand All @@ -109,7 +108,7 @@ jobs:
if: ${{ github.ref == 'refs/heads/main' && github.repository == '5e-bits/5e-database' }}
steps:
- name: Trigger downstream
uses: peter-evans/repository-dispatch@v1
uses: peter-evans/repository-dispatch@v3
with:
token: ${{ secrets.PAT_TOKEN }}
repository: 5e-bits/5e-srd-api
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN apt-get update \
&& apt-get -y install curl \
&& apt-get clean \
&& rm -rf /var/apt/lists/*
RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash -
RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
RUN apt-get install -y nodejs \
&& apt-get clean \
&& rm -rf /var/apt/lists/*
Expand All @@ -31,7 +31,7 @@ RUN mongod --fork --logpath /var/log/mongodb.log --dbpath /data/db2 \
&& mongod --dbpath /data/db2 --shutdown \
&& chown -R mongodb:mongodb /data/db2

# Make the new dir a VOLUME to persists it
# Make the new dir a VOLUME to persists it
VOLUME /data/db2

HEALTHCHECK CMD curl --connect-timeout 10 --silent --fail http://localhost:27017 || exit 1
Expand Down
Loading
Loading