From d133904408402224ba1068530d90e1389122535a Mon Sep 17 00:00:00 2001 From: Antonio Date: Mon, 12 Jun 2023 13:26:22 -0500 Subject: [PATCH 1/7] fix: renamed on push to master to on push to main --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 872f224..251ab44 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Release on: push: - branches: ["master"] + branches: ["main"] jobs: coverage: From f08f3b7558eb2a02b80d3ccfd89cadec65cc508f Mon Sep 17 00:00:00 2001 From: Antonio Date: Mon, 12 Jun 2023 13:42:41 -0500 Subject: [PATCH 2/7] docs: readme file --- README.md | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..5628814 --- /dev/null +++ b/README.md @@ -0,0 +1,61 @@ +# fullproxy + +[![Release](https://github.com/shoriwe/fullproxy/actions/workflows/release.yml/badge.svg)](https://github.com/shoriwe/fullproxy/actions/workflows/release.yml) +[![codecov](https://codecov.io/gh/shoriwe/fullproxy/branch/master/graph/badge.svg?token=WQSZVR7YT7)](https://codecov.io/gh/shoriwe/fullproxy) +![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/shoriwe/fullproxy) +[![Go Report Card](https://goreportcard.com/badge/github.com/shoriwe/fullproxy/v4)](https://goreportcard.com/report/github.com/shoriwe/fullproxy/v4) + +logo + +## Installing + +### Pre-compiled binaries + +You can find pre-compiled binaries in [release](releases/latest) + +### Go install + +Can compile from source with: + +```shell +go install github.com/shoriwe/fullproxy/v4@latest +``` + +### Cloning repository + +- Clone repository + +```shell +git clone https://github.com/shoriwe/fullproxy +``` + +- Build + +```shell +cd fullproxy && go build . +``` + +## Preview + +### Compose + +See [Compose](docs/Compose.md) for more information about **compose contracts**. + +```shell +fullproxy compose ./fullproxy-compose.yaml +``` + +## Documentation + +| File | Description | +| -------------------------------------------------------- | ------------------------------------------------- | +| [Circuits](docs/Circuits.md) | Documentation about how circuits work | +| [CLI](docs/CLI.md) | Documentation of the CLI tool | +| [Compose](docs/Compose.md) | Documentation about the **compose** specification | +| [Continuous integration](docs/Continuous integration.md) | Documentation of the CI | + +## Coverage + +| [![codecov](https://codecov.io/gh/shoriwe/fullproxy/branch/master/graphs/sunburst.svg?token=WQSZVR7YT7)](https://github.com/shoriwe/fullproxy) | [![codecov](https://codecov.io/gh/shoriwe/fullproxy/branch/master/graphs/tree.svg?token=WQSZVR7YT7)](https://github.com/shoriwe/fullproxy) | +| :----------------------------------------------------------: | :----------------------------------------------------------: | + From b9ca0e684283ae61cc99e1ff263abf1e61881b30 Mon Sep 17 00:00:00 2001 From: Antonio Date: Mon, 12 Jun 2023 13:46:20 -0500 Subject: [PATCH 3/7] docs: added test and versioning status badges --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 5628814..922d323 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # fullproxy [![Release](https://github.com/shoriwe/fullproxy/actions/workflows/release.yml/badge.svg)](https://github.com/shoriwe/fullproxy/actions/workflows/release.yml) +[![Test](https://github.com/shoriwe/fullproxy/actions/workflows/test.yml/badge.svg)](https://github.com/shoriwe/fullproxy/actions/workflows/test.yml) +[![Versioning](https://github.com/shoriwe/fullproxy/actions/workflows/version.yml/badge.svg)](https://github.com/shoriwe/fullproxy/actions/workflows/version.yml) [![codecov](https://codecov.io/gh/shoriwe/fullproxy/branch/master/graph/badge.svg?token=WQSZVR7YT7)](https://codecov.io/gh/shoriwe/fullproxy) ![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/shoriwe/fullproxy) [![Go Report Card](https://goreportcard.com/badge/github.com/shoriwe/fullproxy/v4)](https://goreportcard.com/report/github.com/shoriwe/fullproxy/v4) From 48c858d50f3d27e1aec5f33d75a5d32b99ff315f Mon Sep 17 00:00:00 2001 From: Antonio Date: Mon, 12 Jun 2023 14:01:01 -0500 Subject: [PATCH 4/7] fix: checkout dev from dev --- .github/workflows/version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index 209294e..b9648f9 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -18,7 +18,7 @@ jobs: cache: "npm" - name: Git Identity run: | - git checkout main + git checkout dev git fetch --all --tags git config --global user.email "antoniojosedonishung@gmail.com" git config --global user.name "Antonio Donis" From 08a019659ab9473425977243a17b2772d3d6e56d Mon Sep 17 00:00:00 2001 From: Antonio Date: Mon, 12 Jun 2023 14:01:54 -0500 Subject: [PATCH 5/7] fix: push to dev --- .github/workflows/version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index b9648f9..584c23c 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -25,4 +25,4 @@ jobs: - name: Changelog run: 'npx standard-version --message "[ci skip] chore(release): %s"' - name: Push changes - run: git push --follow-tags --force origin main + run: git push --follow-tags --force origin dev From ee4aece5c8c6749363495d865f7cf613ae5eea5a Mon Sep 17 00:00:00 2001 From: Antonio Donis Date: Mon, 12 Jun 2023 19:02:54 +0000 Subject: [PATCH 6/7] [ci skip] chore(release): 4.1.1 --- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30a92c5..7574ae8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### 4.1.1 (2023-06-12) + + +### Bug Fixes + +* push to dev ([08a0196](https://github.com/shoriwe/fullproxy/commit/08a019659ab9473425977243a17b2772d3d6e56d)) + ## [4.1.0](https://github.com/shoriwe/fullproxy/compare/v3.2.0...v4.1.0) (2023-06-12) diff --git a/package-lock.json b/package-lock.json index 26b17cd..b73fd68 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "fullproxy", - "version": "4.1.0", + "version": "4.1.1", "lockfileVersion": 3, "requires": true, "packages": { "": { - "version": "4.1.0", + "version": "4.1.1", "devDependencies": { "git-semver-tags": "^4.1.1", "standard-version": "^9.5.0" diff --git a/package.json b/package.json index 2571621..92ba947 100644 --- a/package.json +++ b/package.json @@ -3,5 +3,5 @@ "git-semver-tags": "^4.1.1", "standard-version": "^9.5.0" }, - "version": "4.1.0" + "version": "4.1.1" } From 55368217ce13750754950c1b2089b041ae89416c Mon Sep 17 00:00:00 2001 From: Antonio Date: Mon, 12 Jun 2023 14:04:01 -0500 Subject: [PATCH 7/7] [ci skip] docs: fixed readme url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 922d323..1863051 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ fullproxy compose ./fullproxy-compose.yaml | [Circuits](docs/Circuits.md) | Documentation about how circuits work | | [CLI](docs/CLI.md) | Documentation of the CLI tool | | [Compose](docs/Compose.md) | Documentation about the **compose** specification | -| [Continuous integration](docs/Continuous integration.md) | Documentation of the CI | +| [Continuous integration](docs/Continuous%20integration.md) | Documentation of the CI | ## Coverage