Skip to content

Commit 943f819

Browse files
authored
Merge pull request #68 from essentialkaos/develop
Improve GitHub Actions workflows
2 parents c7ade8a + be40910 commit 943f819

1 file changed

Lines changed: 14 additions & 41 deletions

File tree

.github/workflows/ci.yml

Lines changed: 14 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,11 @@ jobs:
7979
working-directory: ${{env.SRC_DIR}}
8080
run: make deps
8181

82-
- name: Install Aligo
83-
working-directory: ${{env.SRC_DIR}}
84-
run: |
85-
wget https://apps.kaos.st/aligo/latest/linux/x86_64/aligo
86-
chmod +x aligo
87-
88-
- name: Print Aligo version info
89-
working-directory: ${{env.SRC_DIR}}
90-
run: ./aligo --version
91-
92-
- name: Check Go structs alignment info
93-
working-directory: ${{env.SRC_DIR}}
94-
run: ./aligo check ./...
82+
- name: Check Golang sources with Aligo
83+
uses: essentialkaos/aligo-action@v1
84+
with:
85+
path: ${{env.SRC_DIR}}
86+
files: ./...
9587

9688
Perfecto:
9789
name: Perfecto
@@ -109,44 +101,25 @@ jobs:
109101
username: ${{ secrets.DOCKERHUB_USERNAME }}
110102
password: ${{ secrets.DOCKERHUB_TOKEN }}
111103

112-
- name: Run Perfecto docker image
113-
uses: docker://essentialkaos/perfecto:micro
104+
- name: Check specs with Perfecto
105+
uses: essentialkaos/perfecto-action@v1
114106
with:
115-
args: --version
116-
117-
- name: Install perfecto-docker
118-
run: |
119-
wget https://kaos.sh/perfecto/perfecto-docker
120-
chmod +x perfecto-docker
121-
122-
- name: Run Perfecto check
123-
env:
124-
IMAGE: essentialkaos/perfecto:micro
125-
run: ./perfecto-docker common/sslcli.spec
107+
files: common/sslcli.spec
126108

127109
Hadolint:
128110
name: Hadolint
129111
runs-on: ubuntu-latest
130112

131113
needs: Go
132114

133-
env:
134-
HADOLINT_VERSION: 2.6.1
135-
136115
steps:
137116
- name: Checkout
138117
uses: actions/checkout@v2
139118

140-
- name: Install Hadolint
141-
run: |
142-
wget -O hadolint https://github.com/hadolint/hadolint/releases/download/v${HADOLINT_VERSION}/hadolint-Linux-x86_64
143-
chmod +x hadolint
144-
145-
- name: Print Hadolint version info
146-
run: ./hadolint --version
147-
148-
- name: Check Docker files
149-
run: ./hadolint Dockerfile
119+
- name: Check dockerfiles with Hadolint
120+
uses: essentialkaos/hadolint-action@v1
121+
with:
122+
files: Dockerfile
150123

151124
DockerBuild:
152125
name: Docker Build Check
@@ -164,6 +137,6 @@ jobs:
164137
username: ${{ secrets.DOCKERHUB_USERNAME }}
165138
password: ${{ secrets.DOCKERHUB_TOKEN }}
166139

167-
- name: Build CentOS 7 image
140+
- name: Build Docker image
168141
run: |
169-
docker build -f Dockerfile -t centos7 .
142+
docker build -f Dockerfile -t sslcli .

0 commit comments

Comments
 (0)