Skip to content

Commit

Permalink
Merge pull request #12 from funbox/develop
Browse files Browse the repository at this point in the history
Version 0.11.1
  • Loading branch information
andyone authored Jan 14, 2022
2 parents aefe691 + e6fa67d commit 002f1ed
Show file tree
Hide file tree
Showing 7 changed files with 230 additions and 87 deletions.
109 changes: 109 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -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
- name: Build binaries
working-directory: ${{env.SRC_DIR}}
run: make all

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

- 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-converter.spec
31 changes: 31 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -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
38 changes: 0 additions & 38 deletions .travis.yml

This file was deleted.

4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -45,6 +45,6 @@ help: ## Show this info
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
| awk 'BEGIN {FS = ":.*?## "}; {printf " \033[33m%-25s\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'

################################################################################
18 changes: 6 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
## `init-exporter-converter` [![Build Status](https://travis-ci.org/funbox/init-exporter-converter.svg?branch=master)](https://travis-ci.org/funbox/init-exporter-converter) [![Go Report Card](https://goreportcard.com/badge/github.com/funbox/init-exporter-converter)](https://goreportcard.com/report/github.com/funbox/init-exporter-converter) [![License](https://gh.kaos.io/mit.svg)](LICENSE)
## `init-exporter-converter` [![CI](https://github.com/funbox/init-exporter-converter/actions/workflows/ci.yml/badge.svg)](https://github.com/funbox/init-exporter-converter/actions/workflows/ci.yml) [![Go Report Card](https://goreportcard.com/badge/github.com/funbox/init-exporter-converter)](https://goreportcard.com/report/github.com/funbox/init-exporter-converter) [![License](https://gh.kaos.st/mit.svg)](LICENSE)

Utility for converting [`init-exporter`](https://github.com/funbox/init-exporter) procfiles from v1 to v2 format.

### Installation

#### From sources

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-converter` from scratch, make sure you have a working Go 1.8+ workspace ([instructions](https://golang.org/doc/install)), then:
To build the `init-exporter-converter` from scratch, make sure you have a working Go 1.16+ workspace ([instructions](https://golang.org/doc/install)), then:

```
go get github.com/funbox/init-exporter-converter
Expand Down Expand Up @@ -56,10 +50,10 @@ Examples

### Build status

| Repository | Status |
|------------|--------|
| Stable | [![Build Status](https://travis-ci.org/funbox/init-exporter-converter.svg?branch=master)](https://travis-ci.org/funbox/init-exporter-converter) |
| Unstable | [![Build Status](https://travis-ci.org/funbox/init-exporter-converter.svg?branch=develop)](https://travis-ci.org/funbox/init-exporter-converter) |
| Branch | Status |
|--------|--------|
| Stable | [![CI](https://github.com/funbox/init-exporter-converter/actions/workflows/ci.yml/badge.svg)](https://github.com/funbox/init-exporter-converter/actions/workflows/ci.yml) |
| Unstable | [![CI](https://github.com/funbox/init-exporter-converter/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/funbox/init-exporter-converter/actions/workflows/ci.yml) |

### License

Expand Down
9 changes: 6 additions & 3 deletions common/init-exporter-converter.spec
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

Summary: Utility for converting init-exporter procfiles from v1 to v2 format
Name: init-exporter-converter
Version: 0.11.0
Version: 0.11.1
Release: 0%{?dist}
Group: Development/Tools
License: MIT
Expand All @@ -52,7 +52,7 @@ Source0: %{name}-%{version}.tar.gz

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: golang >= 1.14
BuildRequires: golang >= 1.16

Provides: %{name} = %{version}-%{release}

Expand Down Expand Up @@ -93,7 +93,10 @@ rm -rf %{buildroot}
################################################################################

%changelog
* Thu Jul 30 2020 Anton Novojilov <[email protected]> - 0.11.0-0
* Mon Jan 10 2022 Anton Novojilov <[email protected]> - 0.11.1-0
- Minor UI improvements

* Thu Jul 30 2020 Anton Novojilov <[email protected]> - 0.11.0-0
- Package ek updated to v12
- Package go-simpleyaml updated to v2

Expand Down
Loading

0 comments on commit 002f1ed

Please sign in to comment.