Skip to content

Commit

Permalink
Update actions, move shell-lint to separate workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
bonddim committed Jan 4, 2024
1 parent fb84add commit 57041c2
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 41 deletions.
40 changes: 10 additions & 30 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
name: CI

env:
VERSION_GO: '1.20.12'
VERSION_HELM: 'v3.13.3'
VERSION_HELM: 'v3.11.3'

on:
pull_request:
Expand All @@ -17,17 +16,10 @@ jobs:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ env.VERSION_GO }}

- uses: actions/cache@v2
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
go-version-file: 'go.mod'

- name: Install dependencies
run: make bootstrap
Expand Down Expand Up @@ -73,20 +65,20 @@ jobs:
git config --global core.autocrlf false
git config --global core.eol lf
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup Helm
uses: azure/setup-helm@v1.1
uses: azure/setup-helm@v3
with:
version: ${{ env.VERSION_HELM }}

- name: Setup WSL
if: "contains(matrix.shell, 'wsl')"
uses: Vampire/setup-wsl@v1
uses: Vampire/setup-wsl@v2

- name: Setup Cygwin
if: "contains(matrix.shell, 'cygwin')"
uses: egor-tensin/setup-cygwin@v3
uses: egor-tensin/setup-cygwin@v4
with:
platform: x64

Expand All @@ -103,10 +95,10 @@ jobs:
with:
version: "v0.11.1"

- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup Helm
uses: azure/setup-helm@v1.1
uses: azure/setup-helm@v3
with:
version: ${{ env.VERSION_HELM }}

Expand All @@ -124,15 +116,3 @@ jobs:

- name: helm diff upgrade -C 3 --set replicaCount=2 --install helm-diff ./helm-diff
run: helm diff upgrade -C 3 --set replicaCount=2 --install helm-diff ./helm-diff

shell-lint:
name: Lint install-binary.sh
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]')"
continue-on-error: true
steps:
- uses: actions/checkout@v2.4.0
- uses: luizm/action-sh-checker@v0.3.0
with:
sh_checker_exclude: "scripts"
sh_checker_checkbashisms_enable: true
22 changes: 22 additions & 0 deletions .github/workflows/lint-sh.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Lint sh

on:
push:
branches: [master]
paths: ['install-binary.sh']
pull_request:
branches: [master]
paths: ['install-binary.sh']

jobs:
lint-sh:
name: Lint install-binary.sh
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]')"
continue-on-error: true
steps:
- uses: actions/checkout@v3
- uses: luizm/action-sh-checker@v0.7.0
with:
sh_checker_exclude: 'scripts'
sh_checker_checkbashisms_enable: true
15 changes: 4 additions & 11 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,16 @@ on:
branches: [ master ]
paths-ignore: [ '**.md' ]

env:
GO_VERSION: 1.19

jobs:
lint:
name: Lint
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/setup-go@v3
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: '1.19'

- name: Checkout code
uses: actions/checkout@v3

- name: Golangci lint
uses: golangci/golangci-lint-action@v3
go-version-file: 'go.mod'
- uses: golangci/golangci-lint-action@v3
with:
version: v1.51.0

0 comments on commit 57041c2

Please sign in to comment.