Skip to content

Commit 3c9ccb0

Browse files
andyoneandyone
authored
Merge pull request #13 from funbox/develop
Version 0.11.2
2 parents 002f1ed + 5a31ba5 commit 3c9ccb0

File tree

8 files changed

+69
-33
lines changed

8 files changed

+69
-33
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
strategy:
1919
matrix:
20-
go: [ '1.17.x' ]
20+
go: [ '1.17.x', '1.18.x' ]
2121

2222
steps:
2323
- name: Set up Go
@@ -33,7 +33,7 @@ jobs:
3333
echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
3434
3535
- name: Checkout
36-
uses: actions/checkout@v2
36+
uses: actions/checkout@v3
3737
with:
3838
path: ${{env.SRC_DIR}}
3939

@@ -70,7 +70,7 @@ jobs:
7070
echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
7171
7272
- name: Checkout
73-
uses: actions/checkout@v2
73+
uses: actions/checkout@v3
7474
with:
7575
path: ${{env.SRC_DIR}}
7676

@@ -92,7 +92,7 @@ jobs:
9292

9393
steps:
9494
- name: Code checkout
95-
uses: actions/checkout@v2
95+
uses: actions/checkout@v3
9696

9797
- name: Login to DockerHub
9898
uses: docker/login-action@v1

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
pull_request:
77
branches: [master]
88
schedule:
9-
- cron: '0 19 * * 1,3,5'
9+
- cron: '0 17 * * 1,3,5'
1010

1111
jobs:
1212
analyse:
@@ -19,9 +19,6 @@ jobs:
1919
with:
2020
fetch-depth: 2
2121

22-
- run: git checkout HEAD^2
23-
if: ${{ github.event_name == 'pull_request' }}
24-
2522
- name: Initialize CodeQL
2623
uses: github/codeql-action/init@v1
2724
with:

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
vendor
2-
*~
2+
init-exporter-converter

‎Makefile‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
################################################################################
22

3-
# This Makefile generated by GoMakeGen 1.4.1 using next command:
4-
# gomakegen .
3+
# This Makefile generated by GoMakeGen 1.5.1 using next command:
4+
# gomakegen --mod .
55
#
66
# More info: https://kaos.sh/gomakegen
77

88
################################################################################
99

10+
export GO111MODULE=on
11+
1012
.DEFAULT_GOAL := help
11-
.PHONY = fmt vet all clean git-config deps help
13+
.PHONY = fmt vet all clean deps mod-init mod-update mod-vendor help
1214

1315
################################################################################
1416

@@ -23,13 +25,17 @@ install: ## Install all binaries
2325
uninstall: ## Uninstall all binaries
2426
rm -f /usr/bin/init-exporter-converter
2527

26-
git-config: ## Configure git redirects for stable import path services
27-
git config --global http.https://pkg.re.followRedirects true
28+
deps: mod-update ## Download dependencies
29+
30+
mod-init: ## Initialize new module
31+
go mod init
32+
go mod tidy
33+
34+
mod-update: ## Download modules to local cache
35+
go mod download
2836

29-
deps: git-config ## Download dependencies
30-
go get -d -v github.com/funbox/init-exporter
31-
go get -d -v pkg.re/essentialkaos/ek.v12
32-
go get -d -v pkg.re/essentialkaos/go-simpleyaml.v2
37+
mod-vendor: ## Make vendored copy of dependencies
38+
go mod vendor
3339

3440
fmt: ## Format source code with gofmt
3541
find . -name "*.go" -exec gofmt -s -w {} \;
@@ -45,6 +51,6 @@ help: ## Show this info
4551
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
4652
| awk 'BEGIN {FS = ":.*?## "}; {printf " \033[33m%-25s\033[0m %s\n", $$1, $$2}'
4753
@echo -e ''
48-
@echo -e '\033[90mGenerated by GoMakeGen 1.4.1\033[0m\n'
54+
@echo -e '\033[90mGenerated by GoMakeGen 1.5.1\033[0m\n'
4955

5056
################################################################################

‎common/init-exporter-converter.spec‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
Summary: Utility for converting init-exporter procfiles from v1 to v2 format
4444
Name: init-exporter-converter
45-
Version: 0.11.1
45+
Version: 0.11.2
4646
Release: 0%{?dist}
4747
Group: Development/Tools
4848
License: MIT
@@ -52,7 +52,7 @@ Source0: %{name}-%{version}.tar.gz
5252

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

55-
BuildRequires: golang >= 1.16
55+
BuildRequires: golang >= 1.17
5656

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

@@ -68,16 +68,14 @@ Utility for exporting services described by Procfile to init system.
6868

6969
%build
7070
export GOPATH=$(pwd)
71-
7271
pushd src/github.com/funbox/%{name}
73-
%{__make} %{?_smp_mflags} all
72+
go build -mod vendor %{name}.go
7473
popd
7574

7675
%install
7776
rm -rf %{buildroot}
7877

7978
install -dm 755 %{buildroot}%{_bindir}
80-
8179
install -pm 755 src/github.com/funbox/%{name}/%{name} \
8280
%{buildroot}%{_bindir}/
8381

@@ -93,6 +91,11 @@ rm -rf %{buildroot}
9391
################################################################################
9492

9593
%changelog
94+
* Fri Apr 01 2022 Anton Novojilov <andyone@fun-box.ru> - 0.11.2-0
95+
- Removed pkg.re usage
96+
- Added module info
97+
- Added Dependabot configuration
98+
9699
* Mon Jan 10 2022 Anton Novojilov <andyone@fun-box.ru> - 0.11.1-0
97100
- Minor UI improvements
98101

‎go.mod‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
module github.com/funbox/init-exporter-converter
2+
3+
go 1.17
4+
5+
require (
6+
github.com/essentialkaos/ek/v12 v12.42.1
7+
github.com/essentialkaos/go-simpleyaml/v2 v2.1.3
8+
github.com/funbox/init-exporter v0.24.1
9+
)
10+
11+
require (
12+
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
13+
gopkg.in/yaml.v2 v2.4.0 // indirect
14+
)

‎go.sum‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
github.com/essentialkaos/check v1.2.1 h1:avvyFy/1acUNwfxwuOLsHeCjfXtMygtbu0lVDr3nxFs=
2+
github.com/essentialkaos/ek/v12 v12.42.1 h1:h3PPy0XNXUj1IsEid/p9IzaF0o5hZEGOBFh7XZawAyg=
3+
github.com/essentialkaos/ek/v12 v12.42.1/go.mod h1:Cv/tOZshmFg4pMJnBkg4aW/WyYhzzc41qzZIfk5RSi4=
4+
github.com/essentialkaos/go-simpleyaml/v2 v2.1.3 h1:DAFvXut4ZtkuiTKWqSux3W0myuv3TOAwiD6w5MKWxsM=
5+
github.com/essentialkaos/go-simpleyaml/v2 v2.1.3/go.mod h1:LAUFukPmTZ4fmHa1K3LsH8MO257r/CL/BqlaP/2Vgcs=
6+
github.com/funbox/init-exporter v0.24.1 h1:nQXX4nEq6oh+6Ok7nSRoP2WP97DU5vf84+ASEw3qg+8=
7+
github.com/funbox/init-exporter v0.24.1/go.mod h1:/VrrNrdCYKcKZjoIPx6u0yra/M51tFPZ5v8GKV8eCz4=
8+
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
9+
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
10+
github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
11+
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs=
12+
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
14+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
15+
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
16+
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

‎init-exporter-converter.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ import (
1313
"runtime"
1414
"strings"
1515

16-
"pkg.re/essentialkaos/ek.v12/env"
17-
"pkg.re/essentialkaos/ek.v12/fmtc"
18-
"pkg.re/essentialkaos/ek.v12/fsutil"
19-
"pkg.re/essentialkaos/ek.v12/knf"
20-
"pkg.re/essentialkaos/ek.v12/options"
21-
"pkg.re/essentialkaos/ek.v12/usage"
22-
"pkg.re/essentialkaos/ek.v12/usage/update"
16+
"github.com/essentialkaos/ek/v12/env"
17+
"github.com/essentialkaos/ek/v12/fmtc"
18+
"github.com/essentialkaos/ek/v12/fsutil"
19+
"github.com/essentialkaos/ek/v12/knf"
20+
"github.com/essentialkaos/ek/v12/options"
21+
"github.com/essentialkaos/ek/v12/usage"
22+
"github.com/essentialkaos/ek/v12/usage/update"
2323

24-
"pkg.re/essentialkaos/go-simpleyaml.v2"
24+
"github.com/essentialkaos/go-simpleyaml/v2"
2525

2626
"github.com/funbox/init-exporter/procfile"
2727
)
@@ -31,7 +31,7 @@ import (
3131
// App props
3232
const (
3333
APP = "init-exporter-converter"
34-
VER = "0.11.1"
34+
VER = "0.11.2"
3535
DESC = "Utility for converting procfiles from v1 to v2 format"
3636
)
3737

0 commit comments

Comments
 (0)