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

[Backport 3.26] Use c2cciutils #1631

Merged
merged 1 commit into from
Dec 16, 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
6 changes: 6 additions & 0 deletions .dependabot/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,9 @@ update_configs:
allowed_updates:
- match:
update_type: security
- package_manager: python
directory: /ci
update_schedule: live
automerged_updates:
- match:
update_type: all
17 changes: 14 additions & 3 deletions examples/.editorconfig → .editorconfig
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
charset = utf-8
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
insert_final_newline = true
max_line_length = 110
quote_type = single

[*.js]
indent_size = 2

[*.yaml]
indent_size = 2

[Makefile]
indent_style = tab
32 changes: 0 additions & 32 deletions .github/workflows/audit.yaml

This file was deleted.

2 changes: 2 additions & 0 deletions .github/workflows/backport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ jobs:
backport:
runs-on: ubuntu-18.04
name: Backport
timeout-minutes: 5

steps:
- uses: camptocamp/backport-action@master
with:
Expand Down
18 changes: 0 additions & 18 deletions .github/workflows/clean-dockerhub-tag.yaml

This file was deleted.

27 changes: 0 additions & 27 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

29 changes: 29 additions & 0 deletions .github/workflows/codeql.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: 'Code scanning'

on:
push:
pull_request:
schedule:
- cron: '0 19 * * 0'

jobs:
CodeQL-Build:
runs-on: ubuntu-18.04
name: Code scanning
timeout-minutes: 15
if: "!startsWith(github.event.head_commit.message, '[skip ci] ')"

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
fetch-depth: 1

- name: Initialize CodeQL
uses: github/codeql-action/init@v1

- name: Autobuild
uses: github/codeql-action/autobuild@v1

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
26 changes: 0 additions & 26 deletions .github/workflows/dependabot-auto-merge.yaml

This file was deleted.

33 changes: 17 additions & 16 deletions .github/workflows/ci.yaml → .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@ name: Continuous integration

on:
push:
pull_request:

jobs:
build:
runs-on: ubuntu-18.04
timeout-minutes: 40
name: Continuous integration
if: "!startsWith(github.event.head_commit.message, '[skip ci] ')"

env:
SUMMON_PROVIDER: /usr/local/bin/gopass
SECRETS: ${{ secrets.SECRETS }}

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Get tag
id: tag2
Expand All @@ -27,20 +26,29 @@ jobs:
if: "startsWith(github.ref, 'refs/tags/')"
- run: echo --${{ steps.tag2.outputs.replaced }}--

- run: git --no-pager diff --check `git log --oneline | tail -1 | cut --fields=1 --delimiter=' '`
- run: ci/test-eof-newline

- uses: camptocamp/initialise-gopass-summon-action@v1
- uses: camptocamp/initialise-gopass-summon-action@v2
with:
ci-gpg-private-key: ${{secrets.CI_GPG_PRIVATE_KEY}}
github-gopass-ci-token: ${{secrets.GOPASS_CI_GITHUB_TOKEN}}
patterns: pypi docker
if: env.SECRETS == 'TRUE'
- run: gpg --export-secret-keys --armor D121AF2DFA8E140688BD968930C9B913FD42EF13 > CI.asc
if: env.SECRETS == 'TRUE'

- run: echo "enablePublishing=true" > gradle.properties
if: env.SECRETS == 'TRUE'

- run: |
sudo rm /etc/apt/sources.list.d/*.list
sudo apt-get update
sudo apt-get install python3-wheel python3-setuptools

- run: echo "${HOME}/.local/bin" >> ${GITHUB_PATH}
- run: python3 -m pip install --user --requirement=ci/requirements.txt

- name: Checks
run: c2cciutils-checks

- run: make build
- run: make acceptance-tests-up
- run: make acceptance-tests-run
Expand Down Expand Up @@ -91,15 +99,8 @@ jobs:
path: /tmp/test_results
if: failure()

- run: mkdir -p ~/.docker
- name: Decrypt secrets
run: summon --environment dockerhub bash -c 'envsubst < ci/docker-config.json.tmpl > ~/.docker/config.json'
if: env.SECRETS == 'TRUE'

- name: publish
run: ci/publish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Publish
run: c2cciutils-publish
if: env.SECRETS == 'TRUE'

- id: version
Expand Down
Loading