Skip to content

Commit

Permalink
Add ci for linux and windows build
Browse files Browse the repository at this point in the history
  • Loading branch information
kilpkonn committed Oct 5, 2020
1 parent 35ddaf3 commit d73520c
Show file tree
Hide file tree
Showing 362 changed files with 241 additions and 159,725 deletions.
19 changes: 0 additions & 19 deletions .github/workflows/build-linux.yaml

This file was deleted.

108 changes: 108 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
name: Build
on:
push:
branches:
- master
- develop
pull_request:
branches:
- master
- develop
jobs:
build-linux:
runs-on: ubuntu-latest
env:
GOPATH: ${{ github.workspace }}
GO111MODULE: auto
steps:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.15.x
- name: Checkout code
uses: actions/checkout@v2
with:
path: ./src/github.com/${{ github.repository }}
submodules: true
- name: Install apt dependecies
run: |
sudo apt-get install libgit2-dev libssh2-1-dev libssl-dev cmake
- name: Install go dependencies
run: |
go get -d github.com/Masterminds/sprig
- name: Install git2go
run: |
go get -d github.com/libgit2/git2go
cd $GOPATH/src/github.com/libgit2/git2go
git submodule update --init # get libgit2
cd vendor/libgit2
mkdir build && cd build
cmake ..
make
sudo make install
cd ../../..
make install-static
cd $GOPATH
- name: Build
run: |
go get -v -d github.com/kilpkonn/gtm-enhanced
cd $GOPATH/src/github.com/kilpkonn/gtm-enhanced
mkdir build
go build -o build/ ./...
cd build/
mv gtm-enhanced gtm
chmod +x gtm
cd $GOPATH
- uses: actions/upload-artifact@v2
with:
name: gtm-linux
path: ./src/github.com/${{ github.repository }}/build/
build-windows:
runs-on: windows-latest
env:
GOPATH: ${{ github.workspace }}
GO111MODULE: auto
steps:
- uses: crazy-max/ghaction-chocolatey@v1
with:
args: -h
- name: Install pkg config
run: |
choco install pkgconfiglite
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.15.x
- name: Checkout code
uses: actions/checkout@v2
with:
path: ./src/github.com/${{ github.repository }}
submodules: true
- name: Install go dependencies
run: |
go get -d github.com/Masterminds/sprig
- name: Install git2go
run: |
go get -d github.com/libgit2/git2go
cd ./src/github.com/libgit2/git2go
git submodule update --init # get libgit2
cd vendor/libgit2
new-item -Name "build" -ItemType directory
cd build
cmake -DCMAKE_INSTALL_PREFIX=D:\a\gtm-enhanced\gtm-enhanced\src\github.com\libgit2\git2go\vendor\libgit2\install ..
cmake --build . --target install
- name: Build
run: |
go get -v -d github.com/kilpkonn/gtm-enhanced
cd ./src/github.com/kilpkonn/gtm-enhanced
new-item -Name "build" -ItemType directory
$env:PKG_CONFIG_PATH += ";D:\a\gtm-enhanced\gtm-enhanced\src\github.com\libgit2\git2go\vendor\libgit2\install\lib\pkgconfig"
go build -o build/ main.go
Copy-Item "D:/a/gtm-enhanced/gtm-enhanced/src/github.com/libgit2/git2go/vendor/libgit2/install/bin/git2.dll" -Destination "./build/git2.dll"
cd build
dir
Rename-Item -Path "main.exe" -NewName "gtm.exe"
- uses: actions/upload-artifact@v2
with:
name: gtm-windows
path: ./src/github.com/${{ github.repository }}/build/
42 changes: 42 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
[submodule "github.com/armon/go-radix"]
path = vendor/github.com/armon/go-radix
url = [email protected]:armon/go-radix
[submodule "github.com/bgentry/speakeasy"]
path = vendor/github.com/bgentry/speakeasy
url = [email protected]:bgentry/speakeasy
[submodule "github.com/briandowns/spinner"]
path = vendor/github.com/briandowns/spinner
url = [email protected]:briandowns/spinner
[submodule "github.com/fatih/color"]
path = vendor/github.com/fatih/color
url = [email protected]:fatih/color
[submodule "github.com/hako/durafmt"]
path = vendor/github.com/hako/durafmt
url = [email protected]:hako/durafmt
[submodule "github.com/hashicorp/go-version"]
path = vendor/github.com/hashicorp/go-version
url = [email protected]:hashicorp/go-version
[submodule "github.com/jinzhu/now"]
path = vendor/github.com/jinzhu/now
url = [email protected]:jinzhu/now
[submodule "github.com/mattn/go-isatty"]
path = vendor/github.com/mattn/go-isatty
url = [email protected]:mattn/go-isatty
[submodule "github.com/mitchellh/cli"]
path = vendor/github.com/mitchellh/cli
url = [email protected]:mitchellh/cli
[submodule "golang.org/x/crypto/ssh/terminal"]
path = vendor/golang.org/x/crypto/ssh/terminal
url = https://go.googlesource.com/crypto
[submodule "github.com/posener/complete"]
path = vendor/github.com/posener/complete
url = [email protected]:posener/complete
[submodule "github.com/hashicorp/go-multierror"]
path = vendor/github.com/hashicorp/go-multierror
url = [email protected]:hashicorp/go-multierror
[submodule "golang.org/x/sys/unix"]
path = vendor/golang.org/x/sys
url = https://go.googlesource.com/sys
[submodule "github.com/hashicorp/errwrap"]
path = vendor/github.com/hashicorp/errwrap
url = [email protected]:hashicorp/errwrap
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ brew install gtm

**Windows**

- Download and run the Windows installer from [here](https://github.com/git-time-metric/gtm/releases/latest)
- Download and run the Windows installer from [here](https://github.com/kilpkonn/gtm-enhanced/releases/latest)

**Linux**

Expand All @@ -60,7 +60,7 @@ brew install gtm

**Manually install for Linux, OSX or Windows**

- Download and install the executable from [here](https://github.com/git-time-metric/gtm/releases/latest)
- Download and install the executable from [here](https://github.com/kilpkonn/gtm-enhanced/releases/latest)


### Install a plugin for your editor
Expand Down Expand Up @@ -126,20 +126,20 @@ Time data can be retrieved from the remote repository by fetching.

For help from the command line type `gtm --help` and `gtm <subcommand> --help`.

For additional help please consult the [Wiki](https://github.com/git-time-metric/gtm/wiki).
For additional help please consult the [Wiki](https://github.com/kilpkonn/gtm-enhanced/wiki).

# Contributing
[![Build Status](https://travis-ci.org/git-time-metric/gtm.svg?branch=develop)](https://travis-ci.org/git-time-metric/gtm) [![Build status](https://ci.appveyor.com/api/projects/status/gj6tvm8njgwj0hqi?svg=true)](https://ci.appveyor.com/project/mschenk42/gtm) [![Coverage Status](https://coveralls.io/repos/github/git-time-metric/gtm/badge.svg)](https://coveralls.io/github/git-time-metric/gtm) [![Go Report Card](https://goreportcard.com/badge/github.com/git-time-metric/gtm)](https://goreportcard.com/report/github.com/git-time-metric/gtm)

If you find a bug or have an idea for a new feature please feel free to file new issues and submits PRs. In particular if there isn't a plugin for your favorite editor, go ahead and create one!

For more detail on how to write plugins, check out the [Wiki](https://github.com/git-time-metric/gtm/wiki/Editor-Plugins).
For more detail on how to write plugins, check out the [Wiki](https://github.com/kilpkonn/gtm-enhanced/wiki/Editor-Plugins).

# Support

To report a bug, please submit an issue on the [GitHub Page](https://github.com/git-time-metric/gtm/issues)
To report a bug, please submit an issue on the [GitHub Page](https://github.com/kilpkonn/gtm-enhanced/issues)

Consult the [Wiki](https://github.com/git-time-metric/gtm/wiki) for more information.
Consult the [Wiki](https://github.com/kilpkonn/gtm-enhanced/wiki) for more information.



Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ install:

build_script:
- c:\msys64\usr\bin\bash -lc "cd ${PROJ_DIR} && make git2go-install"
- c:\msys64\usr\bin\bash -lc "/c/gopath/src/github.com/git-time-metric/gtm/script/appveyor-build.sh"
- c:\msys64\usr\bin\bash -lc "/c/gopath/src/github.com/kilpkonn/gtm-enhanced/script/appveyor-build.sh"

artifacts:
- path: gtm.$(appveyor_repo_tag_name).windows.tar.gz
Expand Down
4 changes: 2 additions & 2 deletions command/clean.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"flag"
"strings"

"github.com/kilpkonn/gtm/project"
"github.com/kilpkonn/gtm/util"
"github.com/kilpkonn/gtm-enhanced/project"
"github.com/kilpkonn/gtm-enhanced/util"
"github.com/mitchellh/cli"
)

Expand Down
4 changes: 2 additions & 2 deletions command/clean_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"strings"
"testing"

"github.com/git-time-metric/gtm/project"
"github.com/git-time-metric/gtm/util"
"github.com/kilpkonn/gtm-enhanced/project"
"github.com/kilpkonn/gtm-enhanced/util"
"github.com/mitchellh/cli"
)

Expand Down
2 changes: 1 addition & 1 deletion command/commit.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"flag"
"strings"

"github.com/kilpkonn/gtm/metric"
"github.com/kilpkonn/gtm-enhanced/metric"
"github.com/mitchellh/cli"
)

Expand Down
2 changes: 1 addition & 1 deletion command/commit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"testing"

"github.com/git-time-metric/gtm/util"
"github.com/kilpkonn/gtm-enhanced/util"
"github.com/mitchellh/cli"
)

Expand Down
4 changes: 2 additions & 2 deletions command/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"flag"
"strings"

"github.com/kilpkonn/gtm/project"
"github.com/kilpkonn/gtm/util"
"github.com/kilpkonn/gtm-enhanced/project"
"github.com/kilpkonn/gtm-enhanced/util"

"github.com/mitchellh/cli"
)
Expand Down
2 changes: 1 addition & 1 deletion command/init_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"testing"

"github.com/git-time-metric/gtm/util"
"github.com/kilpkonn/gtm-enhanced/util"
"github.com/mitchellh/cli"
)

Expand Down
12 changes: 6 additions & 6 deletions command/record.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import (
"path/filepath"
"strings"

"github.com/kilpkonn/gtm/event"
"github.com/kilpkonn/gtm/metric"
"github.com/kilpkonn/gtm/note"
"github.com/kilpkonn/gtm/project"
"github.com/kilpkonn/gtm/report"
"github.com/kilpkonn/gtm/scm"
"github.com/kilpkonn/gtm-enhanced/event"
"github.com/kilpkonn/gtm-enhanced/metric"
"github.com/kilpkonn/gtm-enhanced/note"
"github.com/kilpkonn/gtm-enhanced/project"
"github.com/kilpkonn/gtm-enhanced/report"
"github.com/kilpkonn/gtm-enhanced/scm"

"github.com/mitchellh/cli"
)
Expand Down
2 changes: 1 addition & 1 deletion command/record_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"strings"
"testing"

"github.com/git-time-metric/gtm/util"
"github.com/kilpkonn/gtm-enhanced/util"
"github.com/mitchellh/cli"
)

Expand Down
8 changes: 4 additions & 4 deletions command/report.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"time"

"github.com/briandowns/spinner"
"github.com/kilpkonn/gtm/project"
"github.com/kilpkonn/gtm/report"
"github.com/kilpkonn/gtm/scm"
"github.com/kilpkonn/gtm/util"
"github.com/kilpkonn/gtm-enhanced/project"
"github.com/kilpkonn/gtm-enhanced/report"
"github.com/kilpkonn/gtm-enhanced/scm"
"github.com/kilpkonn/gtm-enhanced/util"
isatty "github.com/mattn/go-isatty"
"github.com/mitchellh/cli"
)
Expand Down
4 changes: 2 additions & 2 deletions command/report_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"strings"
"testing"

"github.com/git-time-metric/gtm/project"
"github.com/git-time-metric/gtm/util"
"github.com/kilpkonn/gtm-enhanced/project"
"github.com/kilpkonn/gtm-enhanced/util"
"github.com/mitchellh/cli"
)

Expand Down
10 changes: 5 additions & 5 deletions command/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"fmt"
"strings"

"github.com/kilpkonn/gtm/metric"
"github.com/kilpkonn/gtm/note"
"github.com/kilpkonn/gtm/project"
"github.com/kilpkonn/gtm/report"
"github.com/kilpkonn/gtm/util"
"github.com/kilpkonn/gtm-enhanced/metric"
"github.com/kilpkonn/gtm-enhanced/note"
"github.com/kilpkonn/gtm-enhanced/project"
"github.com/kilpkonn/gtm-enhanced/report"
"github.com/kilpkonn/gtm-enhanced/util"
"github.com/mitchellh/cli"
)

Expand Down
4 changes: 2 additions & 2 deletions command/status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"strings"
"testing"

"github.com/git-time-metric/gtm/project"
"github.com/git-time-metric/gtm/util"
"github.com/kilpkonn/gtm-enhanced/project"
"github.com/kilpkonn/gtm-enhanced/util"
"github.com/mitchellh/cli"
)

Expand Down
2 changes: 1 addition & 1 deletion command/uninit.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"flag"
"strings"

"github.com/kilpkonn/gtm/project"
"github.com/kilpkonn/gtm-enhanced/project"
"github.com/mitchellh/cli"
)

Expand Down
2 changes: 1 addition & 1 deletion command/uninit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"testing"

"github.com/git-time-metric/gtm/util"
"github.com/kilpkonn/gtm-enhanced/util"
"github.com/mitchellh/cli"
)

Expand Down
2 changes: 1 addition & 1 deletion epoch/epoch.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

package epoch

import "github.com/kilpkonn/gtm/util"
import "github.com/kilpkonn/gtm-enhanced/util"

// WindowSize is number seconds in an epoch window
const WindowSize = 60
Expand Down
Loading

0 comments on commit d73520c

Please sign in to comment.