Merge pull request #60 from funbox/develop

Version 0.24.0
funbox · Jan 14, 2022 · 739e748 · 739e748
2 parents 76c212c + 9c0514f
commit 739e748
Show file tree

Hide file tree

Showing 21 changed files with 289 additions and 114 deletions.
diff --git a/docker/Dockerfile.systemd → .docker/Dockerfile.systemd b/docker/Dockerfile.systemd → .docker/Dockerfile.systemd
diff --git a/docker/Dockerfile.upstart → .docker/Dockerfile.upstart b/docker/Dockerfile.upstart → .docker/Dockerfile.upstart
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,109 @@
+name: CI
+
+on:
+  push:
+    branches: [master, develop]
+  pull_request:
+    branches: [master]
+
+jobs:
+  Go:
+    name: Go
+    runs-on: ubuntu-latest
+
+    env:
+      SRC_DIR: src/github.com/${{ github.repository }}
+      GO111MODULE: auto
+
+    strategy:
+      matrix:
+        go: [ '1.17.x' ]
+
+    steps:
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go }}
+        id: go
+
+      - name: Setup PATH
+        run: |
+          echo "GOPATH=${{ github.workspace }}" >> "$GITHUB_ENV"
+          echo "GOBIN=${{ github.workspace }}/bin" >> "$GITHUB_ENV"
+          echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
+
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          path: ${{env.SRC_DIR}}
+
+      - name: Download dependencies
+        working-directory: ${{env.SRC_DIR}}
+        run: |
+          make deps deps-test
+
+      - name: Run tests
+        working-directory: ${{env.SRC_DIR}}
+        run: make test
+
+  Aligo:
+    name: Aligo
+    runs-on: ubuntu-latest
+
+    needs: Go
+
+    env:
+      SRC_DIR: src/github.com/${{ github.repository }}
+      GO111MODULE: auto
+
+    steps:
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: '1.17.x'
+        id: go
+
+      - name: Setup PATH
+        run: |
+          echo "GOPATH=${{ github.workspace }}" >> "$GITHUB_ENV"
+          echo "GOBIN=${{ github.workspace }}/bin" >> "$GITHUB_ENV"
+          echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
+
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          path: ${{env.SRC_DIR}}
+
+      - name: Download dependencies
+        working-directory: ${{env.SRC_DIR}}
+        run: make deps deps-test
+
+      - name: Check Golang sources with Aligo
+        uses: essentialkaos/aligo-action@v1
+        with:
+          path: ${{env.SRC_DIR}}
+          files: ./...
+
+  Perfecto:
+    name: Perfecto
+    runs-on: ubuntu-latest
+
+    needs: Go
+
+    steps:
+      - name: Code checkout
+        uses: actions/checkout@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        env:
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+        if: ${{ env.DOCKERHUB_USERNAME != '' }}
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Check specs with Perfecto
+        uses: essentialkaos/perfecto-action@v1
+        with:
+          files: common/init-exporter.spec
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -0,0 +1,31 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [master, develop]
+  pull_request:
+    branches: [master]
+  schedule:
+    - cron: '0 19 * * 1,3,5'
+
+jobs:
+  analyse:
+    name: Analyse
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 2
+
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: go
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
diff --git a/.travis.yml b/.travis.yml
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 ################################################################################
 
-# This Makefile generated by GoMakeGen 1.3.1 using next command:
+# This Makefile generated by GoMakeGen 1.4.1 using next command:
 # gomakegen .
 #
 # More info: https://kaos.sh/gomakegen
@@ -31,7 +31,7 @@ deps: git-config ## Download dependencies
 	go get -d -v pkg.re/essentialkaos/go-simpleyaml.v2
 
 deps-test: git-config ## Download dependencies for tests
-	go get -d -v pkg.re/check.v1
+	go get -d -v pkg.re/essentialkaos/check.v1
 	go get -d -v pkg.re/essentialkaos/ek.v12
 
 test: ## Run tests
@@ -55,6 +55,6 @@ help: ## Show this info
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
 		| awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[33m%-15s\033[0m %s\n", $$1, $$2}'
 	@echo -e ''
-	@echo -e '\033[90mGenerated by GoMakeGen 1.3.1\033[0m\n'
+	@echo -e '\033[90mGenerated by GoMakeGen 1.4.1\033[0m\n'
 
 ################################################################################
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## `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)
+## `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)
 
 Utility for exporting services described by Procfile to init system.
 Supported init systems: upstart and systemd
@@ -17,20 +17,13 @@ Supported init systems: upstart and systemd
 
 #### From source
 
-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)_):
-
-```
-git config --global http.https://pkg.re.followRedirects true
-```
-
-To build the init-exporter from scratch, make sure you have a working Go 1.13+ workspace ([instructions](https://golang.org/doc/install)), then:
+To build the init-exporter from scratch, make sure you have a working Go 1.16+ workspace ([instructions](https://golang.org/doc/install)), then:
 
 ```bash
 go get -d github.com/funbox/init-exporter
 cd $GOPATH/src/github.com/funbox/init-exporter
-make deps
-make all
-[sudo] make install
+make deps all
+sudo make install
 ```
 
 #### From [ESSENTIAL KAOS Public Repository](https://yum.kaos.st)
@@ -323,13 +316,13 @@ Examples
 
 ### Build status
 
-| Repository | Status |
-|------------|--------|
-| Stable | [![Build Status](https://travis-ci.org/funbox/init-exporter.svg?branch=master)](https://travis-ci.org/funbox/init-exporter) |
-| Unstable | [![Build Status](https://travis-ci.org/funbox/init-exporter.svg?branch=develop)](https://travis-ci.org/funbox/init-exporter) |
+| Branch | Status |
+|--------|--------|
+| Stable | [![CI](https://github.com/funbox/init-exporter/actions/workflows/ci.yml/badge.svg)](https://github.com/funbox/init-exporter/actions/workflows/ci.yml) |
+| 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) |
 
 ### License
 
-init-exporter is released under the MIT license (see [LICENSE](LICENSE))
+`init-exporter` is released under the MIT license (see [LICENSE](LICENSE))
 
 [![Sponsored by FunBox](https://funbox.ru/badges/sponsored_by_funbox_grayscale.svg)](https://funbox.ru)