Skip to content

Commit

Permalink
Merge pull request #347 from otaku0304/dev-to-master
Browse files Browse the repository at this point in the history
Dev to master
  • Loading branch information
otaku0304 authored Oct 6, 2024
2 parents 9d58a7b + 8755281 commit c6ff4b4
Show file tree
Hide file tree
Showing 7 changed files with 2,623 additions and 5,119 deletions.
33 changes: 33 additions & 0 deletions .github/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Auto-merge Dependabot PRs

on:
pull_request:
types:
- opened
- synchronize

jobs:
auto-merge:
runs-on: ubuntu-latest
if: github.actor == 'dependabot[bot]' # Trigger only for Dependabot PRs

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Get Dependabot compatibility score
run: |
pr_url="https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}"
compatibility_score=$(curl -s "$pr_url" | jq -r '.head.repo.compatibility_score')
echo "Compatibility score is $compatibility_score"
- name: Check compatibility score and auto-merge
run: |
if [[ $compatibility_score == "100" ]]; then
echo "Compatibility score is 100%, auto-merging..."
gh pr merge ${{ github.event.pull_request.number }} --auto --squash --delete-branch
else
echo "Compatibility score is not 100%, skipping auto-merge."
fi
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22 changes: 21 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
version: 2
updates:
- package-ecosystem: "npm"
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "monthly"
versioning-strategy: increase
target-branch: "dev"
groups:
angular:
patterns:
- "@angular*"
update-types:
- "minor"
- "patch"
minor-and-patch:
patterns:
- "@angular*"
update-types:
- "patch"
- "minor"
ignore:
- dependency-name: "@angular*"
update-types:
- "version-update:semver-major"

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This is a web-based tool for removing passwords from encrypted PDF files. It consists of two components: a frontend built with Angular and a backend built with Flask.

## Live Application
https://angular-pdf-password-remover-dev.onrender.com/ you can test the application by visiting to this link.
https://angular-pdf-pr-master.onrender.com/ you can test the application by visiting to this link.

## Features

Expand Down
3 changes: 2 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
"inlineStyleLanguage": "scss",
"assets": [
"src/favicon.png",
"src/assets"
"src/assets",
"src/web.config"
],
"styles": [
"@angular/material/prebuilt-themes/indigo-pink.css",
Expand Down
Loading

0 comments on commit c6ff4b4

Please sign in to comment.