Skip to content

Commit

Permalink
Merge pull request #78 from rosineygp/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
rosineygp authored Feb 24, 2020
2 parents 50b7072 + 884bf5f commit b078c03
Show file tree
Hide file tree
Showing 27 changed files with 704 additions and 688 deletions.
49 changes: 20 additions & 29 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,32 @@ jobs:
steps:
- checkout
- run:
name: commitlint
command: make commitlint
name: lint commit
command: make lint.commit
- run:
name: shellcheck
command: make shellcheck
name: lint shellcheck
command: make lint.shellcheck
- run:
name: unit
command: make unit
name: test unit
command: make test.unit
- run:
name: simple
command: make simple
name: examples simple
command: make examples.simple
- run:
name: multi-images
command: make multi-images
name: examples service
command: make examples.service
- run:
name: service
command: make service
name: examples dind
command: make examples.dind
- run:
name: dind
command: make dind
name: examples escapes
command: make examples.escapes
- run:
name: shell
command: make shell
name: examples stdout
command: make examples.stdout
- run:
name: trap
command: make trap
name: examples shell
command: make examples.shell
- run:
name: implicit-job
command: make implicit-job
- run:
name: escapes
command: make escapes
- run:
name: stdout
command: make stdout
- run:
name: pipeline
command: make examples/pipeline
name: examples pipeline
command: make examples.pipeline
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: coverage
run: make coverage
- name: coverage report
run: make _coverage.report
env:
SURGE_LOGIN: ${{ secrets.SURGE_LOGIN }}
SURGE_TOKEN: ${{ secrets.SURGE_TOKEN }}
49 changes: 23 additions & 26 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# pipeline autogen by mkdkr_exporter
# https://gitlab.com/rosiney.gp/mkdkr_exporter

name: CI

on: [push]
Expand All @@ -9,29 +12,23 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: commitlint
run: make commitlint
- name: shellcheck
run: make shellcheck
- name: unit
run: make unit
- name: simple
run: make simple
- name: multi-images
run: make multi-images
- name: service
run: make service
- name: dind
run: make dind
- name: shell
run: make shell
- name: trap
run: make trap
- name: implicit-job
run: make implicit-job
- name: escapes
run: make escapes
- name: stdout
run: make stdout
- name: pipeline
run: make examples/pipeline
- name: lint commit
run: make lint.commit
- name: lint shellcheck
run: make lint.shellcheck
- name: test unit
run: make test.unit
- name: examples simple
run: make examples.simple
- name: examples service
run: make examples.service
- name: examples dind
run: make examples.dind
- name: examples escapes
run: make examples.escapes
- name: examples stdout
run: make examples.stdout
- name: examples shell
run: make examples.shell
- name: examples pipeline
run: make examples.pipeline
82 changes: 34 additions & 48 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# pipeline autogen by mkdkr_exporter
# https://gitlab.com/rosiney.gp/mkdkr_exporter

stages:
- lint
- unit
- scenarios
- test
- examples

services:
- docker:19.03.1-dind
Expand All @@ -13,71 +16,54 @@ variables:
image: docker:19

before_script:
- apk add make
- apk add bash
- apk add git
- apk add make bash git

commitlint:
lint commit:
stage: lint
script:
- make commitlint
- make lint.commit

shellcheck:
lint shellcheck:
stage: lint
script:
- make shellcheck

unit:
stage: unit
script:
- make unit
- make lint.shellcheck

simple:
stage: scenarios
test unit:
stage: test
script:
- make simple
- make test.unit

multi-images:
stage: scenarios
examples simple:
stage: examples
script:
- make multi-images
- make examples.simple

service:
stage: scenarios
examples service:
stage: examples
script:
- make service
- make examples.service

dind:
stage: scenarios
examples dind:
stage: examples
script:
- make dind
- make examples.dind

shell:
stage: scenarios
examples escapes:
stage: examples
script:
- make shell
- make examples.escapes

trap:
stage: scenarios
examples stdout:
stage: examples
script:
- make trap
- make examples.stdout

implicit-job:
stage: scenarios
examples shell:
stage: examples
script:
- make implicit-job
- make examples.shell

escapes:
stage: scenarios
examples pipeline:
stage: examples
script:
- make escapes

stdout:
stage: scenarios
script:
- make stdout

pipeline:
stage: scenarios
script:
- make examples/pipeline
- make examples.pipeline
Loading

0 comments on commit b078c03

Please sign in to comment.