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

bump Serverless #72

Merged
merged 3 commits into from
Oct 23, 2020
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
2 changes: 1 addition & 1 deletion .github/workflows/md-links.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Check links in markdown

on:
schedule:
- cron: "1 6 * * *"
- cron: "1 6 */3 * *"
push:
paths: ['**.md', 'md-link-check.json', '.github/workflows/md-links.yaml']

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upload_lambda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
# - if: github.base_ref == 'master'
# run "serverless deploy --verbose" in a docker container and run the config file serverless.yml
- name: Deploy lambda
uses: serverless/github-action@v1.54.0
uses: serverless/github-action@v2.1.0
env: # all mandatory
# AWS
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upload_lambda_from_comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:

# run "serverless deploy --verbose" in a docker container and run the config file serverless.yml
- name: Deploy lambda
uses: serverless/github-action@v1.54.0
uses: serverless/github-action@v2.1.0
env: # all mandatory
# AWS
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY }}
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.5.0] - 2020-10-21

### Changed

- Bump serverless to v2.1.
- Run the link checker every 3 days only.

## [1.4.1] - 2020-10-11

### Fixed
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Online DevOps Dojo [![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://opensource.org/licenses/MPL-2.0)

[![Deployment of Online DevOps Dojo coach lambda](../../workflows/Deployment%20of%20Online%20DevOps%20Dojo%20coach%20lambda/badge.svg)](../../actions?query=workflow%3A%22Deployment+of+Online+DevOps+Dojo+coach+lambda%22)
[![Check links in markdown](../../workflows/Check%20links%20in%20markdown/badge.svg)](../../actions?query=workflow%3A%22Check+links+in+markdown%22)
[![Javascript linter](../../workflows/Javascript%20linter/badge.svg)](../../actions?query=workflow%3A%22Javascript+linter%22)
[![Check links in markdown](../../workflows/Check%20links%20in%20markdown/badge.svg)](../../actions?query=workflow%3A%22Check+links+in+markdown%22)
[![Deployment of Online DevOps Dojo coach lambda](../../workflows/Deployment%20of%20Online%20DevOps%20Dojo%20coach%20lambda/badge.svg)](../../actions?query=workflow%3A%22Deployment+of+Online+DevOps+Dojo+coach+lambda%22)

This repository contains the source of the **[Online DevOps Dojo](https://dxc-technology.github.io/about-devops-dojo/)**
This repository contains the sources of the **[Online DevOps Dojo](https://dxc-technology.github.io/about-devops-dojo/)**
Katacoda Scenarios and the coach robot.

If you are landing here and just want to get going with the training, please
Expand All @@ -14,7 +14,7 @@ go to [about the DevOps Dojo](https://dxc-technology.github.io/about-devops-dojo

See a [history of the changes](CHANGELOG.md) to the **Online DevOps Dojo**.

## Files
## Files description

### Training scenarios

Expand All @@ -35,10 +35,10 @@ training pages
- [`package.json`](package.json): Node package dependencies
- [`package-lock.json`](package-lock.json): Tested set of Node module dependencies

### Continuous delivery
### CI/CD

- [`.github/workflows/upload_lambda.yml`](.github/workflows/upload_lambda.yml):
GitHub workflow triggered on repository pushes, which uploads the coach lambda function.
GitHub workflow triggered on repository pushes, which uploads the coach lambda function to AWS.
- [`.github/workflows/upload_lambda_from_comment.yml`](.github/workflows/upload_lambda_from_comment.yml):
Same upload as above but triggered by a comment `/deploy` (convenient to avoid void commit).
- [`serverless.yml`](serverless.yml): Serverless deployment configuration file
Expand Down
52 changes: 34 additions & 18 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
"dependencies": {
"@probot/serverless-lambda": "0.5.0",
"minimist": "^1.2.5",
"node": "^12.18.4",
"node": "^12.19.0",
"probot": "^9.15.1"
},
"devDependencies": {
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.12.0",
"eslint-config-prettier": "^6.13.0",
"jest": "^25.5.4",
"nock": "^12.0.3",
"nodemon": "^2.0.4",
"nodemon": "^2.0.6",
"prettier": "1.19.1",
"smee-client": "^1.2.2",
"standard": "^14.3.4"
Expand Down
6 changes: 3 additions & 3 deletions serverless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

service: devops-dojo-robot

frameworkVersion: ">=1.4.0 <2.0.0"
frameworkVersion: "^2.1.0"

provider:
name: aws
Expand All @@ -19,7 +19,7 @@ provider:
environment: ${env:AWS_STAGE}
application-id: online-devops-dojo
Application: online-devops-dojo
version: "1.4.0"
version: "1.2.0" # This is the version of the lambda (js)
owner: "[email protected]"
group: "doe"

Expand Down Expand Up @@ -48,7 +48,7 @@ functions:
WEBHOOK_SECRET: ${env:WEBHOOK_SECRET}
APP_ID: ${env:APP_ID}
PRIVATE_KEY: ${env:PRIVATE_KEY}
VERSION: "1.4.0"
VERSION: "1.5.0" # This is the latest version from the changelog

# create the API Gateway
events:
Expand Down