Skip to content

Commit

Permalink
Merge branch 'master' into prepare-pluggable-inventory
Browse files Browse the repository at this point in the history
  • Loading branch information
MatteoVoges authored Sep 19, 2023
2 parents be6bf34 + 542119b commit b9ab5b6
Show file tree
Hide file tree
Showing 21 changed files with 721 additions and 442 deletions.
10 changes: 8 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,18 @@ updates:
schedule:
interval: "weekly"
commit-message:
prefix: "PIP dependency update"
prefix: "chore: "
ignore:
- dependency-name: "google-api-python-client"
labels:
- "pip"
- "dependencies"
open-pull-requests-limit: 2
reviewers:
- "kapicorp/kapicorpdevs"
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
labels:
- "github-actions"
76 changes: 0 additions & 76 deletions .github/workflows/docker-image.yml

This file was deleted.

34 changes: 14 additions & 20 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,27 @@
---
name: Build and deploy documentation on merge to master

concurrency:
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
cancel-in-progress: true

on:
push:
branches:
- master
paths:
- 'docs/**'
- 'requirements.docs.txt'
- 'Dockerfile.docs'
- 'mkdocs.yml'
- 'CNAME'

jobs:
build:
docs:
runs-on: ubuntu-latest
steps:
- name: Checkout kapitan recursively
uses: actions/checkout@master
with:
submodules: recursive
- name: Strip git ref prefix from tag version and store in TAG_VERSION
run: |
echo "TAG_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
echo "REF_NAME=${GITHUB_REF##*/}" >> $GITHUB_ENV
- name: Strip full version and just keep major part in MAJOR_VERSION VAR
run: |
echo "MAJOR_VERSION=${TAG_VERSION:0:4}" >> $GITHUB_ENV
# Printing versions needs to be a separate step,
# as they aren't set during the previous two steps
- name: Print Versions
run: |
echo ${{ env.TAG_VERSION }}
echo ${{ env.MAJOR_VERSION }}
echo ${{ env.REF_NAME }}
uses: actions/checkout@v4

- name: Deploy docs
uses: mhausenblas/mkdocs-deploy-gh-pages@master
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/pex-build-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
name: PEX Build and Upload

on:
release:
types: [created]
workflow_run:
workflows:
- Upload Python Package
Expand All @@ -15,15 +13,15 @@ jobs:
if: false # disable as this is not working with multiple python versions
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.x
- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: 1.17
- name: Install Python dependencies
Expand Down
14 changes: 0 additions & 14 deletions .github/workflows/python-black.yml

This file was deleted.

8 changes: 6 additions & 2 deletions .github/workflows/python-pip-publish.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
---
name: Upload Python Package

concurrency:
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
cancel-in-progress: true

on:
release:
types: [created]
Expand All @@ -9,11 +13,11 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.x
- name: Install dependencies
Expand Down
Loading

0 comments on commit b9ab5b6

Please sign in to comment.