Skip to content

Commit

Permalink
Merge pull request #601 from frontendnetwork/staging
Browse files Browse the repository at this point in the history
Deploy
  • Loading branch information
philipbrembeck authored Jan 14, 2024
2 parents 26120fb + f8331bb commit 061ba13
Show file tree
Hide file tree
Showing 6 changed files with 124 additions and 56 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@9dc751fe249ad99385a2583ee0d084c400eee04e
uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

Expand All @@ -62,7 +62,7 @@ jobs:

steps:
- name: SSH into the server and run Docker Compose
uses: appleboy/[email protected].2
uses: appleboy/[email protected].3
with:
host: ${{ secrets.SSH_HOST }}
username: ${{ secrets.SSH_USERNAME }}
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@9dc751fe249ad99385a2583ee0d084c400eee04e
uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

Expand All @@ -123,7 +123,7 @@ jobs:

steps:
- name: SSH into the server and run Docker Compose
uses: appleboy/[email protected].2
uses: appleboy/[email protected].3
with:
host: ${{ secrets.SSH_HOST }}
username: ${{ secrets.SSH_USERNAME }}
Expand Down
19 changes: 18 additions & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build and Lint PRs
on: [pull_request]

jobs:
build:
regular_build:
runs-on: ubuntu-latest

steps:
Expand All @@ -17,3 +17,20 @@ jobs:
- run: npm ci
- run: npm run build
- run: npm run lint

legacy_peer_deps_build:
runs-on: ubuntu-latest
needs: regular_build
if: ${{ always() && needs.regular_build.result == 'failure' }}

steps:
- uses: actions/checkout@v4

- uses: actions/setup-node@v4
with:
node-version: '18.x'
cache: 'npm'

- run: npm ci --legacy-peer-deps
- run: npm run build
- run: npm run lint
8 changes: 0 additions & 8 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
# Contributor Covenant Code of Conduct

## Foreword of the FrontEndNet.work Team
Please note that we communicate in English only in our repositories, our issues, and our pull requests.
Please speak to us in English as well to keep our projects accessible to everyone.
We are not native speakers and will not take offense if something is worded wrong or your English is not that good.

Please note that it is not our aim to write the most beautiful or modern code, but that we are only concerned about the functionality of the code and the comprehensibility.
Vulnerabilities or similar things should not happen and should be fixed quickly.

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
Expand Down
27 changes: 24 additions & 3 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,32 @@
# Security Policy

> [!IMPORTANT]
> Up-to-Date contact information can be found in our [security.txt](https://vegancheck.me/.well-known/security.txt)!

## Supported Versions

Only the current released versions and the versions available online (on https://vegancheck.me) are in scope.
Only the current released versions and the versions available online (on https://vegancheck.me) are supported officially. Forks are not within our scope.

## Scope of the Security Policy
The Scope of this Security Policy includes:
- analytics.vegancheck.me
- api.vegancheck.me
- dev.vegancheck.me *
- grade.vegancheck.me
- grades.vegancheck.me
- mastobot.vegancheck.me †
- preprod.vegancheck.me *
- staging.vegancheck.me
- vegancheck.me


> [!NOTE]
> Entries marked with * should only be accessible via VPN. <br />
> Entries marked with † should only be accessible via Authentification (e.g. Bearer Token).<br />
> The full scope can be found on [philip.media Security Policy Scope](https://security.philip.media/scope.html).
Also, [api.vegancheck.me](https://api.vegancheck.me), [grade.vegancheck.me](https://grade.vegancheck.me) and [grades.vegancheck.me](https://grades.vegancheck.me) are in scope.

## Reporting a Vulnerability

You can read more about reporting a vulnerability [here](https://philip-media.github.io/security-policy/vdp.html). Please also see our contact details in our [security.txt](https://cldsi.de/.well-known/security.txt).
You can read more about reporting a vulnerability [here](https://security.philip.media/vdp). Please also see our contact details in our [security.txt](https://vegancheck.me/.well-known/security.txt).
106 changes: 72 additions & 34 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
},
"dependencies": {
"@ducanh2912/next-pwa": "^9.7.2",
"@ericblade/quagga2": "^1.8.2",
"@ericblade/quagga2": "^1.8.4",
"@frontendnetwork/vegancheck": "^1.1.45",
"@types/node": "20.9.1",
"@types/react-dom": "18.2.14",
"@types/node": "20.11.0",
"@types/react-dom": "18.2.18",
"eslint-config-sznm": "^2.0.2",
"jest-worker": "^29.7.0",
"million": "^2.6.4",
Expand All @@ -24,16 +24,16 @@
"nookies": "^2.5.2",
"react": "18.2.0",
"react-dom": "18.2.0",
"sass": "^1.69.5",
"sass": "^1.69.7",
"sharp": "^0.33.1",
"typescript": "5.3.3"
},
"devDependencies": {
"@playwright/test": "^1.40.1",
"@types/react": "^18.2.38",
"@types/react": "^18.2.47",
"@typescript-eslint/eslint-plugin": "^5.42.0",
"@typescript-eslint/parser": "^5.62.0",
"@typescript-eslint/typescript-estree": "^6.12.0",
"@typescript-eslint/typescript-estree": "^6.18.1",
"eslint": "8.52.0",
"eslint-config-next": "^14.0.4",
"eslint-plugin-import": "^2.29.0"
Expand Down

0 comments on commit 061ba13

Please sign in to comment.