diff --git a/.github/renovate.json b/.github/renovate.json new file mode 100644 index 0000000..29448e6 --- /dev/null +++ b/.github/renovate.json @@ -0,0 +1,3 @@ +{ + "extends": ["github>gwendolyngoetz/renovate-config"] +} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..a4e58aa --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,25 @@ +name: Build Only + +on: + workflow_dispatch: {} + push: + branches: [ master ] + paths-ignore: + - '**.md' + pull_request: + branches: [ master ] + paths-ignore: + - '**.md' +env: + ver_num: "1.0.${{ github.run_number }}" + +jobs: + build-linux: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Run Make + run: "VERSION=${{ env.ver_num }} make" diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 89b9dd5..b7447d6 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -1,4 +1,4 @@ -name: Makefile CI +name: Build and Release on: workflow_dispatch: {} @@ -44,7 +44,7 @@ jobs: retention-days: 90 - name: Create Release - uses: ncipollo/release-action@v1.10.0 + uses: ncipollo/release-action@v1.11.1 with: artifactErrorsFailBuild: true artifacts: "package/prompt_${{ env.ver_num }}.deb,package/prompt_${{ env.ver_num }}.zip" diff --git a/README.md b/README.md index 6148951..4ac8aa3 100644 --- a/README.md +++ b/README.md @@ -6,17 +6,21 @@ ![image](https://user-images.githubusercontent.com/195162/169644884-2200e447-7510-44c1-8106-6faa3f35dfe8.png) -## Notes +## Tested on -### Tested on - -* Ubuntu 20.10 - * Alacritty +### OS +* Ubuntu 20.10, 22.04 * MacOS Monterey - * Alacritty - * iTerm2 * Windows 10 - * Windows Terminal + +### Shell +* Bash +* PowerShell + +### Terminal +* Alacritty +* iTerm2 +* Windows Terminal ## Build and Install @@ -54,7 +58,7 @@ Add to `$env:UserProfile\Documents\PowerShell\Microsoft.PowerShell_profile.ps1` ```powershell function prompt { if (Test-Path -Path "$env:LocalAppData\prompt\promptwin.exe" -PathType Leaf) { - # Only displaying the first line by defailt so forcing it + # Only displaying the first line by default so forcing it $a = invoke-expression "$env:LocalAppData\prompt\promptwin.exe" $a[0] + "`r`n" + $a[1] } diff --git a/go.mod b/go.mod index e7ef17a..1c8eeaa 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module gwendolyngoetz/prompt -go 1.18 +go 1.19 require ( - github.com/go-ini/ini v1.66.4 + github.com/go-ini/ini v1.67.0 gopkg.in/ini.v1 v1.66.4 // indirect ) diff --git a/go.sum b/go.sum index aea929e..1811c9f 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,6 @@ github.com/go-ini/ini v1.66.4 h1:dKjMqkcbkzfddhIhyglTPgMoJnkvmG+bSLrU9cTHc5M= github.com/go-ini/ini v1.66.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= +github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A= +github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4= gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= diff --git a/pkg/computer/computer_test.go b/pkg/computer/computer_test.go index d82e31c..764639f 100644 --- a/pkg/computer/computer_test.go +++ b/pkg/computer/computer_test.go @@ -13,7 +13,7 @@ func TestGetUserName(t *testing.T) { func TestGetHostname(t *testing.T) { got := GetHostname() - want := "thalia" + want := "hestia" if got != want { t.Errorf("got '%s' want '%s'", got, want) @@ -22,7 +22,7 @@ func TestGetHostname(t *testing.T) { func TestGetOsIcon(t *testing.T) { got := GetOsIcon() - want := "" + want := "" if got != want { t.Errorf("got '%s' want '%s'", got, want) diff --git a/pkg/git/git_test.go b/pkg/git/git_test.go index 3a270ad..b2404d5 100644 --- a/pkg/git/git_test.go +++ b/pkg/git/git_test.go @@ -22,7 +22,7 @@ func TestGetRepoName(t *testing.T) { func TestGetRepoRelativePath(t *testing.T) { got := GetRepoRelativePath() - want := "pkg/git" + want := ":pkg/git" if got != want { t.Errorf("got '%s' want '%s'", got, want) @@ -40,7 +40,7 @@ func TestHasStatusChanges(t *testing.T) { func TestHasStashes(t *testing.T) { got := HasStashes() - want := true + want := false if got != want { t.Errorf("got %t want %t", got, want)