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

feat(travis): apply changes from build config validation #98

Merged
merged 1 commit into from
Nov 16, 2019
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
13 changes: 9 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@
# vim: ft=yaml
---
## Machine config
os: 'linux'
arch: 'amd64'
dist: 'bionic'
version: '~> 1.0'

## Language and cache config
language: 'ruby'
cache: 'bundler'

## Stages and jobs matrix
stages:
- test
Expand Down Expand Up @@ -56,7 +62,6 @@ jobs:
@semantic-release/git@7
deploy:
provider: 'script'
skip_cleanup: true
script:
# Run `semantic-release`
- npx semantic-release@15
cleanup: false
# Run `semantic-release`
script: 'npx semantic-release@15'
4 changes: 2 additions & 2 deletions ssf/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ ssf_node_anchors:
# An alternative method could be to use:
# `git describe --abbrev=0 --tags`
# yamllint disable rule:line-length
title: 'ci(travis): use build config validation (beta) [skip ci]'
body: '* Automated using https://github.com/myii/ssf-formula/pull/97'
title: 'ci(travis): apply changes from build config validation [skip ci]'
body: '* Automated using https://github.com/myii/ssf-formula/pull/98'
# yamllint enable rule:line-length
github:
owner: 'saltstack-formulas'
Expand Down
48 changes: 26 additions & 22 deletions ssf/files/default/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,24 @@ fast_finish: true
{%- set use_saltcheck = True %}
{%- endif %}
## Machine config
dist: {{ travis.dist }}
os: 'linux'
arch: 'amd64'
dist: '{{ travis.dist }}'
version: '~> 1.0'

## Language and cache config
language: 'ruby'
cache: 'bundler'

{%- if platforms and not use_cirrus_ci %}
sudo: required

## Services config
services:
- docker
{%- set travis_addons = travis.addons %}
{%- if travis_addons %}

## Addons config
# yamllint disable rule:indentation
addons:
{%- filter indent(2) %}
Expand All @@ -51,10 +60,6 @@ addons:
# yamllint enable rule:indentation
{%- endif %}

## Language and cache config
language: ruby
cache: bundler

## Script to run for the test stage
script:
{%- for pre_cmd in script_kitchen.pre %}
Expand Down Expand Up @@ -99,19 +104,19 @@ script:
## Stages and jobs matrix
stages:
- test
- name: release
if: branch = master AND type != pull_request
- name: 'release'
if: 'branch = master AND type != pull_request'
jobs:
{{- format_allow_failures(travis.use_single_job_for_linters) }}
include:
## Define the test stage that runs the linters (and testing matrix, if applicable)

{{ comment_linters }}
- language: node_js
node_js: lts/*
env: Lint
- language: 'node_js'
node_js: 'lts/*'
env: 'Lint'
name: '{{ name_linters }}'
before_install: skip
before_install: 'skip'
script:
{#- Prepare variable used for `pip` #}
{%- set pip_cmd = 'pip' %}
Expand Down Expand Up @@ -176,12 +181,12 @@ jobs:
{%- endif %}

## Define the release stage that runs `semantic-release`
- stage: release
language: node_js
node_js: lts/*
env: Release
- stage: 'release'
language: 'node_js'
node_js: 'lts/*'
env: 'Release'
name: 'Run semantic-release inc. file updates to AUTHORS, CHANGELOG & FORMULA'
before_install: skip
before_install: 'skip'
script:
# Update `AUTHORS.md`
- export MAINTAINER_TOKEN=${GH_TOKEN}
Expand All @@ -193,8 +198,7 @@ jobs:
@semantic-release/exec@3
@semantic-release/git@7
deploy:
provider: script
skip_cleanup: true
script:
# Run `semantic-release`
- npx semantic-release@15
provider: 'script'
cleanup: false
# Run `semantic-release`
script: 'npx semantic-release@15'
200 changes: 0 additions & 200 deletions ssf/files/tofs_ssf-formula/.travis.yml

This file was deleted.