forked from sakura-tel/areionskey
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'sakura-tel/sakura-tel/develop' into ats…
…uchan/dev
- Loading branch information
Showing
10 changed files
with
486 additions
and
406 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,31 @@ | ||
| # To get started with Dependabot version updates, you'll need to specify which | ||
| # package ecosystems to update and where the package manifests are located. | ||
| # Please see the documentation for all configuration options: | ||
| # https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates | ||
|
|
||
| version: 2 | ||
| updates: | ||
| - package-ecosystem: npm | ||
| directory: "/" | ||
| schedule: | ||
| interval: daily | ||
| open-pull-requests-limit: 20 | ||
| - package-ecosystem: "npm" # See documentation for possible values | ||
| directory: "/" # Location of package manifests | ||
| schedule: | ||
| interval: "daily" | ||
| open-pull-requests-limit: 99 | ||
| labels: | ||
| - "📦 Dependencies" | ||
| - "🧶 JavaScript" | ||
|
|
||
| - package-ecosystem: "docker" # See documentation for possible values | ||
| directory: "/" # Location of package manifests | ||
| schedule: | ||
| interval: "daily" | ||
| labels: | ||
| - "📦 Dependencies" | ||
| - "⚓ Docker" | ||
|
|
||
| - package-ecosystem: "gitsubmodule" # See documentation for possible values | ||
| directory: "/" # Location of package manifests | ||
| schedule: | ||
| interval: "daily" | ||
| labels: | ||
| - "📦 Dependencies" | ||
| - "⛓ Submodules" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| name: Dependabot auto-merge | ||
| on: pull_request_target | ||
|
|
||
| permissions: | ||
| pull-requests: write | ||
| contents: write | ||
|
|
||
| jobs: | ||
| dependabot: | ||
| runs-on: ubuntu-latest | ||
| if: ${{ github.actor == 'dependabot[bot]' }} | ||
| steps: | ||
| - name: Dependabot metadata | ||
| id: metadata | ||
| uses: dependabot/fetch-metadata@v1.1.1 | ||
| with: | ||
| github-token: '${{ secrets.GITHUB_TOKEN }}' | ||
| - name: Enable auto-merge for Dependabot PRs | ||
| if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' }} | ||
| run: gh pr merge --auto --merge "$PR_URL" | ||
| env: | ||
| PR_URL: ${{github.event.pull_request.html_url}} | ||
| GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| name: E2E Test | ||
|
|
||
| on: [push] | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| matrix: | ||
| node-version: [12.x, 14.x, 16.x] | ||
| python-version: [3.9] | ||
|
|
||
| services: | ||
| postgres: | ||
| image: postgres:10-alpine | ||
| ports: | ||
| - 5432:5432 | ||
| env: | ||
| POSTGRES_DB: test-misskey | ||
| POSTGRES_HOST_AUTH_METHOD: trust | ||
|
|
||
| redis: | ||
| image: redis:alpine | ||
| ports: | ||
| - 6379:6379 | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| with: | ||
| submodules: true | ||
|
|
||
| - name: Use Node.js ${{ matrix.node-version }} | ||
| uses: actions/setup-node@v2 | ||
| with: | ||
| node-version: ${{ matrix.node-version }} | ||
| cache: 'yarn' | ||
|
|
||
| - run: yarn install --prefer-offline | ||
| - run: yarn build | ||
| - run: cp e2e/e2e.yml .config/default.yml | ||
| - run: yarn migrateandstart & | ||
|
|
||
| - name: Use Python ${{ matrix.python-version }} | ||
| uses: actions/setup-python@v2 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
|
|
||
| - name: Run pip install | ||
| run: pip install -r requirements.txt | ||
| working-directory: ./e2e | ||
|
|
||
| - name: Setup playwright | ||
| run: python -m playwright install | ||
| working-directory: ./e2e | ||
|
|
||
| - name: Run E2E Test | ||
| run: pytest run.py | ||
| working-directory: ./e2e | ||
|
|
||
| - name: Upload E2E ScreenShots | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: ScreenShots-${{ matrix.node-version }} | ||
| path: e2e/ScreenShots |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| [submodule "misskey-assets"] | ||
| path = misskey-assets | ||
| url = https://github.com/misskey-dev/assets.git | ||
| url = https://github.com/misskey-dev/assets.git | ||
| [submodule "e2e"] | ||
| path = e2e | ||
| url = https://github.com/sakura-tel/milkey-e2e |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM node:16.13.0-alpine3.13 AS base | ||
| FROM node:17.3.0-alpine3.13 AS base | ||
|
|
||
| ENV NODE_ENV=production | ||
|
|
||
|
|
||
Submodule misskey-assets
updated
4 files
| + − | banner-2.png | |
| + − | banner.png | |
| + − | icon.png | |
| +7 −0 | misskey.svg |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.