Skip to content

Commit

Permalink
asdasdsad
Browse files Browse the repository at this point in the history
  • Loading branch information
Junjiequan committed Apr 15, 2024
1 parent a2f3e8d commit 5dc10eb
Show file tree
Hide file tree
Showing 4 changed files with 108 additions and 55 deletions.
56 changes: 28 additions & 28 deletions .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
name: Dependabot approve and merge
# name: Dependabot approve and merge

on: pull_request_target
# on: pull_request_target

jobs:
dependabot:
runs-on: ubuntu-latest
if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
steps:
## Extract information about the dependencies being updated by a Dependabot-generated PR
- name: Dependabot metadata
id: dependabot-metadata
uses: dependabot/[email protected]
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
# jobs:
# dependabot:
# runs-on: ubuntu-latest
# if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
# steps:
# ## Extract information about the dependencies being updated by a Dependabot-generated PR
# - name: Dependabot metadata
# id: dependabot-metadata
# uses: dependabot/[email protected]
# with:
# github-token: "${{ secrets.GITHUB_TOKEN }}"

- name: Checkout repository
uses: actions/checkout@v4
# - name: Checkout repository
# uses: actions/checkout@v4

## NOTE: This step is only required if the repository has been configured to Require approval
## Checks if update-type is patch or minor, then approve if the PR status is not approved yet.
- name: Auto approve patch and minor updates
uses: hmarr/auto-approve-action@v4
if: ${{steps.dependabot-metadata.outputs.update-type == 'version-update:semver-patch' || steps.dependabot-metadata.outputs.update-type == 'version-update:semver-minor'}}
# ## NOTE: This step is only required if the repository has been configured to Require approval
# ## Checks if update-type is patch or minor, then approve if the PR status is not approved yet.
# - name: Auto approve patch and minor updates
# uses: hmarr/auto-approve-action@v4
# if: ${{steps.dependabot-metadata.outputs.update-type == 'version-update:semver-patch' || steps.dependabot-metadata.outputs.update-type == 'version-update:semver-minor'}}

## NOTE: Requirements for merge has to be configured in the Branch protection rule page.
## To do so, go to repository > Settings > Branches > Edit.
- name: Enable auto-merge for Dependabot PRs
if: ${{ contains(github.event.pull_request.title, 'bump')}}
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
# ## NOTE: Requirements for merge has to be configured in the Branch protection rule page.
# ## To do so, go to repository > Settings > Branches > Edit.
# - name: Enable auto-merge for Dependabot PRs
# if: ${{ contains(github.event.pull_request.title, 'bump')}}
# run: gh pr merge --auto --merge "$PR_URL"
# env:
# PR_URL: ${{github.event.pull_request.html_url}}
# GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
99 changes: 76 additions & 23 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"ngx-json-viewer": "^3",
"ngx-linky": "^4.0.0",
"ngx-material-luxon": "^1.1.1",
"rxjs": "^7.8.1",
"rxjs": "^6.6.6",
"shortid": "^2.2.16",
"socket.io-client": "^4.7.2",
"tslib": "^2.4.0",
Expand Down
6 changes: 3 additions & 3 deletions src/app/shared/sdk/models/FireLoopRef.ts
Original file line number Diff line number Diff line change
Expand Up @@ -330,9 +330,9 @@ export class FireLoopRef<T> {
subject.next(res);
}
});
if (event.match("dispose")) {
setTimeout(() => subject.next());
}
// if (event.match("dispose")) {
// setTimeout(() => subject.next());
// }
// This event listener will be wiped within socket.connections
this.socket.sharedObservables.sharedOnDisconnect.subscribe(() =>
subject.complete(),
Expand Down

0 comments on commit 5dc10eb

Please sign in to comment.