Skip to content

Commit 739e748

Browse files
andyoneandyone
authoredJan 14, 2022
Merge pull request #60 from funbox/develop
Version 0.24.0
·
v0.26.0v0.24.0
2 parents 76c212c + 9c0514f commit 739e748

21 files changed

+289
-114
lines changed
 

‎docker/Dockerfile.systemd ‎.docker/Dockerfile.systemd

File renamed without changes.

‎docker/Dockerfile.upstart ‎.docker/Dockerfile.upstart

File renamed without changes.

‎.github/workflows/ci.yml

+109
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches: [master, develop]
6+
pull_request:
7+
branches: [master]
8+
9+
jobs:
10+
Go:
11+
name: Go
12+
runs-on: ubuntu-latest
13+
14+
env:
15+
SRC_DIR: src/github.com/${{ github.repository }}
16+
GO111MODULE: auto
17+
18+
strategy:
19+
matrix:
20+
go: [ '1.17.x' ]
21+
22+
steps:
23+
- name: Set up Go
24+
uses: actions/setup-go@v2
25+
with:
26+
go-version: ${{ matrix.go }}
27+
id: go
28+
29+
- name: Setup PATH
30+
run: |
31+
echo "GOPATH=${{ github.workspace }}" >> "$GITHUB_ENV"
32+
echo "GOBIN=${{ github.workspace }}/bin" >> "$GITHUB_ENV"
33+
echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
34+
35+
- name: Checkout
36+
uses: actions/checkout@v2
37+
with:
38+
path: ${{env.SRC_DIR}}
39+
40+
- name: Download dependencies
41+
working-directory: ${{env.SRC_DIR}}
42+
run: |
43+
make deps deps-test
44+
45+
- name: Run tests
46+
working-directory: ${{env.SRC_DIR}}
47+
run: make test
48+
49+
Aligo:
50+
name: Aligo
51+
runs-on: ubuntu-latest
52+
53+
needs: Go
54+
55+
env:
56+
SRC_DIR: src/github.com/${{ github.repository }}
57+
GO111MODULE: auto
58+
59+
steps:
60+
- name: Set up Go
61+
uses: actions/setup-go@v2
62+
with:
63+
go-version: '1.17.x'
64+
id: go
65+
66+
- name: Setup PATH
67+
run: |
68+
echo "GOPATH=${{ github.workspace }}" >> "$GITHUB_ENV"
69+
echo "GOBIN=${{ github.workspace }}/bin" >> "$GITHUB_ENV"
70+
echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
71+
72+
- name: Checkout
73+
uses: actions/checkout@v2
74+
with:
75+
path: ${{env.SRC_DIR}}
76+
77+
- name: Download dependencies
78+
working-directory: ${{env.SRC_DIR}}
79+
run: make deps deps-test
80+
81+
- name: Check Golang sources with Aligo
82+
uses: essentialkaos/aligo-action@v1
83+
with:
84+
path: ${{env.SRC_DIR}}
85+
files: ./...
86+
87+
Perfecto:
88+
name: Perfecto
89+
runs-on: ubuntu-latest
90+
91+
needs: Go
92+
93+
steps:
94+
- name: Code checkout
95+
uses: actions/checkout@v2
96+
97+
- name: Login to DockerHub
98+
uses: docker/login-action@v1
99+
env:
100+
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
101+
if: ${{ env.DOCKERHUB_USERNAME != '' }}
102+
with:
103+
username: ${{ secrets.DOCKERHUB_USERNAME }}
104+
password: ${{ secrets.DOCKERHUB_TOKEN }}
105+
106+
- name: Check specs with Perfecto
107+
uses: essentialkaos/perfecto-action@v1
108+
with:
109+
files: common/init-exporter.spec

‎.github/workflows/codeql.yml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: [master, develop]
6+
pull_request:
7+
branches: [master]
8+
schedule:
9+
- cron: '0 19 * * 1,3,5'
10+
11+
jobs:
12+
analyse:
13+
name: Analyse
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- name: Checkout repository
18+
uses: actions/checkout@v2
19+
with:
20+
fetch-depth: 2
21+
22+
- run: git checkout HEAD^2
23+
if: ${{ github.event_name == 'pull_request' }}
24+
25+
- name: Initialize CodeQL
26+
uses: github/codeql-action/init@v1
27+
with:
28+
languages: go
29+
30+
- name: Perform CodeQL Analysis
31+
uses: github/codeql-action/analyze@v1

‎.travis.yml

-39
This file was deleted.

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
################################################################################
22

3-
# This Makefile generated by GoMakeGen 1.3.1 using next command:
3+
# This Makefile generated by GoMakeGen 1.4.1 using next command:
44
# gomakegen .
55
#
66
# More info: https://kaos.sh/gomakegen
@@ -31,7 +31,7 @@ deps: git-config ## Download dependencies
3131
go get -d -v pkg.re/essentialkaos/go-simpleyaml.v2
3232

3333
deps-test: git-config ## Download dependencies for tests
34-
go get -d -v pkg.re/check.v1
34+
go get -d -v pkg.re/essentialkaos/check.v1
3535
go get -d -v pkg.re/essentialkaos/ek.v12
3636

3737
test: ## Run tests
@@ -55,6 +55,6 @@ help: ## Show this info
5555
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
5656
| awk 'BEGIN {FS = ":.*?## "}; {printf " \033[33m%-15s\033[0m %s\n", $$1, $$2}'
5757
@echo -e ''
58-
@echo -e '\033[90mGenerated by GoMakeGen 1.3.1\033[0m\n'
58+
@echo -e '\033[90mGenerated by GoMakeGen 1.4.1\033[0m\n'
5959

6060
################################################################################

‎README.md

+9-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## `init-exporter` [![Build Status](https://travis-ci.org/funbox/init-exporter.svg?branch=master)](https://travis-ci.org/funbox/init-exporter) [![Go Report Card](https://goreportcard.com/badge/github.com/funbox/init-exporter)](https://goreportcard.com/report/github.com/funbox/init-exporter) [![License](https://gh.kaos.st/mit.svg)](LICENSE)
1+
## `init-exporter` [![CI](https://github.com/funbox/init-exporter/actions/workflows/ci.yml/badge.svg)](https://github.com/funbox/init-exporter/actions/workflows/ci.yml) [![Go Report Card](https://goreportcard.com/badge/github.com/funbox/init-exporter)](https://goreportcard.com/report/github.com/funbox/init-exporter) [![License](https://gh.kaos.st/mit.svg)](LICENSE)
22

33
Utility for exporting services described by Procfile to init system.
44
Supported init systems: upstart and systemd
@@ -17,20 +17,13 @@ Supported init systems: upstart and systemd
1717

1818
#### From source
1919

20-
Before the initial install allows git to use redirects for [pkg.re](https://github.com/essentialkaos/pkgre) service (_reason why you should do this described [here](https://github.com/essentialkaos/pkgre#git-support)_):
21-
22-
```
23-
git config --global http.https://pkg.re.followRedirects true
24-
```
25-
26-
To build the init-exporter from scratch, make sure you have a working Go 1.13+ workspace ([instructions](https://golang.org/doc/install)), then:
20+
To build the init-exporter from scratch, make sure you have a working Go 1.16+ workspace ([instructions](https://golang.org/doc/install)), then:
2721

2822
```bash
2923
go get -d github.com/funbox/init-exporter
3024
cd $GOPATH/src/github.com/funbox/init-exporter
31-
make deps
32-
make all
33-
[sudo] make install
25+
make deps all
26+
sudo make install
3427
```
3528

3629
#### From [ESSENTIAL KAOS Public Repository](https://yum.kaos.st)
@@ -323,13 +316,13 @@ Examples
323316
324317
### Build status
325318
326-
| Repository | Status |
327-
|------------|--------|
328-
| Stable | [![Build Status](https://travis-ci.org/funbox/init-exporter.svg?branch=master)](https://travis-ci.org/funbox/init-exporter) |
329-
| Unstable | [![Build Status](https://travis-ci.org/funbox/init-exporter.svg?branch=develop)](https://travis-ci.org/funbox/init-exporter) |
319+
| Branch | Status |
320+
|--------|--------|
321+
| Stable | [![CI](https://github.com/funbox/init-exporter/actions/workflows/ci.yml/badge.svg)](https://github.com/funbox/init-exporter/actions/workflows/ci.yml) |
322+
| Unstable | [![CI](https://github.com/funbox/init-exporter/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/funbox/init-exporter/actions/workflows/ci.yml) |
330323
331324
### License
332325
333-
init-exporter is released under the MIT license (see [LICENSE](LICENSE))
326+
`init-exporter` is released under the MIT license (see [LICENSE](LICENSE))
334327
335328
[![Sponsored by FunBox](https://funbox.ru/badges/sponsored_by_funbox_grayscale.svg)](https://funbox.ru)

0 commit comments

Comments
 (0)
Please sign in to comment.