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

Updated workflows #87

Merged
merged 4 commits into from
Sep 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/pr-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ documentation: 'documentation/*'
feature: 'feature/*'
hotfix: 'hotfix/*'
quality: 'quality/*'
workflow: 'workflow/*'
2 changes: 1 addition & 1 deletion .github/workflows/issue-open-workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
- name: Set Milestone of the Issue
uses: Code-Hex/auto-milestone-binder@v1.0.1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
github-token: ${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/on-push-tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ jobs:
- name: Generate Release From Tag
uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
repo_token: "${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }}"
prerelease: false
26 changes: 26 additions & 0 deletions .github/workflows/on-version-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,29 @@ jobs:
with:
tag-prefix: ''
token: ${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }}

create-version-update-pr:
name: "Create Version Update PR"
runs-on: ubuntu-latest
needs: bump-version

steps:
- name: Checkout Repo
uses: actions/checkout@v2
with:
token: ${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }}
ref: develop

- name: Hard Reset Master
run: |
git fetch origin master:master
git reset --hard master

- name: Create PR
uses: peter-evans/create-pull-request@v3
with:
token: ${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }}
branch: workflow/version-update
delete-branch: true
base: develop
title: 'Version Update PR'
22 changes: 22 additions & 0 deletions .github/workflows/pr-labeled-at-develop-workflows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: PR Labeled at Develop Workflows

on:
pull_request:
types:
- labeled
branches:
- develop

jobs:
auto-merge:
name: "Auto Merge"
runs-on: ubuntu-latest
steps:
- name: automerge
uses: "pascalgn/automerge-action@v0.14.3"
env:
GITHUB_TOKEN: "${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }}"
MERGE_LABELS: "workflow"
MERGE_COMMIT_MESSAGE: "Auto merge for PR with workflow label"
MERGE_FORKS: "false"
MERGE_RETRY_SLEEP: "60000"
4 changes: 2 additions & 2 deletions .github/workflows/pr-open-workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Add Label to PR
uses: TimonVS/pr-labeler-action@v3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }}

automate-project-columns:
name: "Automate Project Columns"
Expand All @@ -35,4 +35,4 @@ jobs:
- name: Set Milestone of the PR
uses: Code-Hex/auto-milestone-binder@v1.0.1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
github-token: ${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p align="center">
<a href="https://opentemplatehub.com">
<img src="https://github.com/open-template-hub/open-template-hub.github.io/blob/master/assets/logo/servers/auth-server-logo.png?raw=true" alt="Logo" width=200>
<img src="https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/logo/server/auth-server-logo.png" alt="Logo" width=200>
</a>
</p>

Expand Down
2 changes: 1 addition & 1 deletion app.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "Auth Server Template",
"description": "Authentication Server Template supporting both regular signup and login processes and login with social networks that support OAuth and OAuth2.0",
"repository": "https://github.com/open-template-hub/auth-server-nodejs-template",
"logo": "https://github.com/open-template-hub/open-template-hub.github.io/blob/master/assets/logo/brand-logo.png?raw=true",
"logo": "https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/logo/brand-logo.png",
"keywords": [
"authentication",
"server",
Expand Down
6 changes: 3 additions & 3 deletions assets/mail-templates/forget-password-mail-template.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<tr>
<td style="text-align: center; vertical-align: middle; box-sizing: border-box; padding: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px;">
<img
src="https://github.com/open-template-hub/open-template-hub.github.io/blob/master/assets/logo/brand-logo.png?raw=true"
src="https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/logo/brand-logo.png"
alt="logo"
style="max-width: 100%; border-style: none; height: 70px; width: 70px; margin-bottom: 10px; margin-top: 40px"
class="CToWUd">
Expand Down Expand Up @@ -128,14 +128,14 @@ <h2 style="margin: 0; margin-bottom: 15px; font-family: 'Open Sans', 'Helvetica
<a href="https://github.com/open-template-hub"
style="box-sizing: border-box; font-weight: 400; text-decoration: none; font-size: 12px; padding: 0 5px;"
target="_blank" rel=noopener><img
src="https://github.com/open-template-hub/open-template-hub.github.io/blob/master/assets/social/github.png?raw=true"
src="https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/social/github.png"
height="32"
alt="logo" style="max-width: 100%; border-style: none"
class="CToWUd"></a> <a
href="https://www.linkedin.com/company/open-template-hub"
style="box-sizing: border-box; font-weight: 400; text-decoration: none; font-size: 12px; padding: 0 5px;"
target="_blank" rel=noopener><img
src="https://github.com/open-template-hub/open-template-hub.github.io/blob/master/assets/social/linkedin.png?raw=true"
src="https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/social/linkedin.png"
height="32"
alt="logo" style="max-width: 100%; border-style: none"
class="CToWUd"></a>
Expand Down
6 changes: 3 additions & 3 deletions assets/mail-templates/verify-account-mail-template.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<tr>
<td style="text-align: center; vertical-align: middle; box-sizing: border-box; padding: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px">
<img
src="https://github.com/open-template-hub/open-template-hub.github.io/blob/master/assets/logo/brand-logo.png?raw=true"
src="https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/logo/brand-logo.png"
alt="logo"
style="max-width: 100%; border-style: none; height: 70px; width: 70px; margin-bottom: 10px; margin-top: 40px"
class="CToWUd">
Expand Down Expand Up @@ -130,14 +130,14 @@ <h2 style="margin: 0; margin-bottom: 30px; font-family: 'Open Sans', 'Helvetica
<a href="https://github.com/open-template-hub"
style="box-sizing: border-box; font-weight: 400; text-decoration: none; font-size: 12px; padding: 0 5px;"
target="_blank" rel=noopener><img
src="https://github.com/open-template-hub/open-template-hub.github.io/blob/master/assets/social/github.png?raw=true"
src="https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/social/github.png"
height="32"
alt="logo" style="max-width: 100%; border-style: none"
class="CToWUd"></a> <a
href="https://www.linkedin.com/company/open-template-hub"
style="box-sizing: border-box; font-weight: 400; text-decoration: none; font-size: 12px; padding: 0 5px;"
target="_blank" rel=noopener><img
src="https://github.com/open-template-hub/open-template-hub.github.io/blob/master/assets/social/linkedin.png?raw=true"
src="https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/social/linkedin.png"
height="32"
alt="logo" style="max-width: 100%; border-style: none"
class="CToWUd"></a>
Expand Down