Skip to content

Commit

Permalink
Merge branch 'dev' into releases/v4
Browse files Browse the repository at this point in the history
  • Loading branch information
JamesIves committed Jan 6, 2022
2 parents 0c59194 + 7f5f01a commit fd3cf89
Show file tree
Hide file tree
Showing 22 changed files with 174 additions and 98 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
@@ -1,2 +1,2 @@
ARG VARIANT=12
ARG VARIANT=14
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:${VARIANT}
2 changes: 1 addition & 1 deletion .devcontainer/base.Dockerfile
@@ -1,4 +1,4 @@
ARG VARIANT=12-buster
ARG VARIANT=14-buster
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:dev-${VARIANT}

# Install tslint, typescript. eslint is installed by javascript image
Expand Down
26 changes: 14 additions & 12 deletions .devcontainer/devcontainer.json
@@ -1,15 +1,17 @@
// https://github.com/microsoft/vscode-dev-containers/tree/master/containers/typescript-node
{
"name": "Node.js & TypeScript",
"build": {
"dockerfile": "Dockerfile",
"args": {
"VARIANT": "12"
}
},
"settings": {
"terminal.integrated.shell.linux": "/bin/bash"
},
"extensions": ["dbaeumer.vscode-eslint"],
"remoteUser": "node"
"name": "Node.js & TypeScript",
"build": {
"dockerfile": "Dockerfile",
"args": {
"VARIANT": "14"
}
},
"settings": {
"terminal.integrated.shell.linux": "/bin/bash"
},
"extensions": [
"dbaeumer.vscode-eslint"
],
"remoteUser": "node"
}
6 changes: 5 additions & 1 deletion .github/ISSUE_TEMPLATE/BUG_REPORT.md
Expand Up @@ -17,7 +17,11 @@ labels:

## Logs

<!-- Please provide your deployment logs and a link or sample to/of your workflow. If the error message isn't revealing the problem please set ACTIONS_STEP_DEBUG to true in your repository's secrets menu and run the workflow again. -->
<!-- Please provide your deployment logs. If the error message isn't revealing the problem please set ACTIONS_STEP_DEBUG to true in your repository's secrets menu and run the workflow again. -->

## Workflow

<!-- Please provide a link or snippet of your workflow yml file. -->

## Additional Comments

Expand Down
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Expand Up @@ -6,3 +6,10 @@ updates:
interval: daily
time: '10:00'
open-pull-requests-limit: 10

- package-ecosystem: github-actions
directory: '/'
schedule:
interval: daily
time: '10:00'
open-pull-requests-limit: 10
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Expand Up @@ -14,9 +14,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v2.4.0

- uses: actions/setup-node@v1.4.4
- uses: actions/setup-node@v2.5.1
with:
node-version: 'v14.18.1'
registry-url: 'https://registry.npmjs.org'
Expand All @@ -31,17 +31,17 @@ jobs:
yarn test
- name: Uploade CodeCov Report
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v2.1.0
with:
token: ${{ secrets.CODECOV_TOKEN }}

build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v2.4.0

- uses: actions/setup-node@v1.4.4
- uses: actions/setup-node@v2.5.1
with:
node-version: 'v14.18.1'
registry-url: 'https://registry.npmjs.org'
Expand Down Expand Up @@ -77,11 +77,11 @@ jobs:
max-parallel: 1
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v2.4.0
with:
persist-credentials: false

- uses: actions/setup-node@v1.4.4
- uses: actions/setup-node@v2.5.1
with:
node-version: 'v14.18.1'
registry-url: 'https://registry.npmjs.org'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Expand Up @@ -19,7 +19,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v2.4.0

- name: Initialize CodeQL
uses: github/codeql-action/init@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Expand Up @@ -8,12 +8,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v2.4.0

# Workflow dispatch event that pushes the current version to the release branch.
# From here the secondary production deployment workflow will trigger to build the dependencies.
- name: Deploy 馃殌
uses: JamesIves/github-pages-deploy-action@4.0.0
uses: JamesIves/github-pages-deploy-action@4.1.9
with:
branch: releases/v4
folder: .
Expand Down
58 changes: 29 additions & 29 deletions .github/workflows/integration.yml
Expand Up @@ -20,10 +20,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v2.4.0

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@releases/v4
uses: JamesIves/github-pages-deploy-action@4.1.9
with:
git-config-name: Montezuma
git-config-email: montezuma@jamesiv.es
Expand All @@ -44,7 +44,7 @@ jobs:
uses: actions/checkout@v1

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@releases/v4
uses: JamesIves/github-pages-deploy-action@4.1.9
with:
token: ${{ secrets.ACCESS_TOKEN }}
branch: gh-pages
Expand All @@ -55,7 +55,7 @@ jobs:
silent: true

- name: Cleanup Generated Branch
uses: dawidd6/action-delete-branch@v2.0.1
uses: dawidd6/action-delete-branch@v3.1.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branches: gh-pages
Expand All @@ -66,20 +66,20 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v2.4.0
with:
persist-credentials: false

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@releases/v4
uses: JamesIves/github-pages-deploy-action@4.1.9
with:
branch: gh-pages
folder: integration
target-folder: cat/montezuma2
silent: true

- name: Cleanup Generated Branch
uses: dawidd6/action-delete-branch@v2.0.1
uses: dawidd6/action-delete-branch@v3.1.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branches: gh-pages
Expand All @@ -94,7 +94,7 @@ jobs:
LANG: C.UTF-8
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v2.4.0
with:
persist-credentials: false

Expand All @@ -103,15 +103,15 @@ jobs:
apt-get update && apt-get install -y rsync
- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@releases/v4
uses: JamesIves/github-pages-deploy-action@4.1.9
with:
branch: gh-pages
folder: integration
target-folder: cat/montezuma2
silent: true

- name: Cleanup Generated Branch
uses: dawidd6/action-delete-branch@v2.0.1
uses: dawidd6/action-delete-branch@v3.1.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branches: gh-pages
Expand All @@ -122,12 +122,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v2.4.0
with:
persist-credentials: false

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@releases/v4
uses: JamesIves/github-pages-deploy-action@4.1.9
with:
ssh-key: ${{ secrets.DEPLOY_KEY }}
branch: gh-pages
Expand All @@ -136,7 +136,7 @@ jobs:
silent: true

- name: Cleanup Generated Branch
uses: dawidd6/action-delete-branch@v2.0.1
uses: dawidd6/action-delete-branch@v3.1.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branches: gh-pages
Expand All @@ -147,17 +147,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v2.4.0
with:
persist-credentials: false

- name: Install SSH Client
uses: webfactory/ssh-agent@v0.4.1
uses: webfactory/ssh-agent@v0.5.4
with:
ssh-private-key: ${{ secrets.DEPLOY_KEY }}

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@releases/v4
uses: JamesIves/github-pages-deploy-action@4.1.9
with:
ssh-key: true
branch: gh-pages
Expand All @@ -166,7 +166,7 @@ jobs:
silent: true

- name: Cleanup Generated Branch
uses: dawidd6/action-delete-branch@v2.0.1
uses: dawidd6/action-delete-branch@v3.1.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branches: gh-pages
Expand All @@ -176,17 +176,17 @@ jobs:
needs: integration-ssh-third-party-client
runs-on: ubuntu-latest
steps:
- uses: actions/setup-node@v1.4.4
- uses: actions/setup-node@v2.5.1
with:
node-version: 'v14.18.1'

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v2.4.0
with:
persist-credentials: false

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@releases/v4
uses: JamesIves/github-pages-deploy-action@4.1.9
with:
ssh-key: ${{ secrets.DEPLOY_KEY }}
branch: gh-pages
Expand All @@ -195,7 +195,7 @@ jobs:
silent: true

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@releases/v4
uses: JamesIves/github-pages-deploy-action@4.1.9
with:
ssh-key: ${{ secrets.DEPLOY_KEY }}
branch: gh-pages
Expand All @@ -204,7 +204,7 @@ jobs:
silent: true

- name: Cleanup Generated Branch
uses: dawidd6/action-delete-branch@v2.0.1
uses: dawidd6/action-delete-branch@v3.1.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branches: gh-pages
Expand All @@ -218,17 +218,17 @@ jobs:
integration-container,
integration-ssh,
integration-ssh-third-party-client,
integration-env
integration-env,
]
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v2.4.0
with:
persist-credentials: false

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@releases/v4
uses: JamesIves/github-pages-deploy-action@4.1.9
with:
token: ${{ secrets.ACCESS_TOKEN }}
branch: gh-pages
Expand All @@ -242,12 +242,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v2.4.0
with:
persist-credentials: false

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@releases/v4
uses: JamesIves/github-pages-deploy-action@4.1.9
with:
token: ${{ secrets.ACCESS_TOKEN }}
branch: integration-test-delete-prod
Expand All @@ -256,7 +256,7 @@ jobs:
silent: true

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@releases/v4
uses: JamesIves/github-pages-deploy-action@4.1.9
with:
token: ${{ secrets.ACCESS_TOKEN }}
branch: integration-test-delete-prod
Expand All @@ -266,7 +266,7 @@ jobs:
silent: true

- name: Cleanup Generated Branch
uses: dawidd6/action-delete-branch@v2.0.1
uses: dawidd6/action-delete-branch@v3.1.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branches: integration-test-delete-prod
4 changes: 2 additions & 2 deletions .github/workflows/production.yml
Expand Up @@ -13,9 +13,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v2.4.0

- uses: actions/setup-node@v1.4.4
- uses: actions/setup-node@v2.5.1
with:
node-version: 'v14.18.1'
registry-url: 'https://registry.npmjs.org'
Expand Down

0 comments on commit fd3cf89

Please sign in to comment.