From 705e505d32664b222a7bd73b31cc7090f45778cf Mon Sep 17 00:00:00 2001 From: dabumana Date: Thu, 13 Jul 2023 19:54:17 -0500 Subject: [PATCH 1/9] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0921ced..fcb3ca9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ src/export* src/training* src/.env src/test/.env +.env From e1f07abf08f74b0d0ccb3352e78bed0f2504144e Mon Sep 17 00:00:00 2001 From: dabumana Date: Thu, 13 Jul 2023 19:54:32 -0500 Subject: [PATCH 2/9] Update makefile --- src/makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/makefile b/src/makefile index f53a8d3..7d737bf 100644 --- a/src/makefile +++ b/src/makefile @@ -3,7 +3,12 @@ VERSION=v.0.0.0 PKG_LIST=$(go list ./... | grep -v /vendor/ | tr '\n' ' ') build: - go build -o ./bin/${APP}-${VERSION} + mkdir bin + mkdir bin/caos + cp .env ./bin/caos + cp -r template ./bin/caos + go build -o ./bin/caos/${APP} + clean: go clean @@ -28,7 +33,7 @@ env: openssl x509 -in localCA.crt -out localCA.pem -outform PEM run: - ./bin/${APP}-${VERSION} + ./bin/caos/${APP} test: go test ./... From 7145b0ccc68f2b3d353a1a687331cdf70d4bd644 Mon Sep 17 00:00:00 2001 From: dabumana Date: Thu, 13 Jul 2023 21:17:10 -0500 Subject: [PATCH 3/9] Update build.yml --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20ca627..d26522d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,11 +20,14 @@ jobs: - name: Version id: semantic - uses: codacy/git-version@2.4.0 + uses: codfish/semantic-release-action@v2.0.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: release-branch: master dev-branch: developer prefix: v. + - name: Dependencies run: sudo apt-get install libcurl4-openssl-dev From 6e0cd3c7875190a2d5d095044db08a72e9c18871 Mon Sep 17 00:00:00 2001 From: dabumana Date: Thu, 13 Jul 2023 22:08:37 -0500 Subject: [PATCH 4/9] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d26522d..951b127 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build on: push: - branches: ["main"] + branches: ["main","developer"] pull_request: branches: ["main"] From 1c671e68a47d4a404b4185b2a33ad9001e448ed9 Mon Sep 17 00:00:00 2001 From: dabumana Date: Thu, 13 Jul 2023 22:12:49 -0500 Subject: [PATCH 5/9] Update build.yml --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 951b127..2dac62e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,9 @@ name: Build on: push: - branches: ["main","developer"] + branches: + - main + - developer pull_request: branches: ["main"] From 21d8429cc991915031ac9ef48bd3bae49bdd47cd Mon Sep 17 00:00:00 2001 From: dabumana Date: Thu, 13 Jul 2023 22:21:36 -0500 Subject: [PATCH 6/9] Create .releaserc --- src/.releaserc | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/.releaserc diff --git a/src/.releaserc b/src/.releaserc new file mode 100644 index 0000000..76375d3 --- /dev/null +++ b/src/.releaserc @@ -0,0 +1,7 @@ +branches: + - name: "main" + +plugins: + - "@semantic-release/commit-analyzer" + - "@semantic-release/release-notes-generator" + - "@semantic-release/github" \ No newline at end of file From 16cff6dc8bca980e4f478ed59e1a7dbd5cfb772d Mon Sep 17 00:00:00 2001 From: dabumana Date: Thu, 13 Jul 2023 22:31:37 -0500 Subject: [PATCH 7/9] Update build.yml --- .github/workflows/build.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2dac62e..68a08d9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,9 +2,7 @@ name: Build on: push: - branches: - - main - - developer + branches: ["main", "developer"] pull_request: branches: ["main"] @@ -25,11 +23,6 @@ jobs: uses: codfish/semantic-release-action@v2.0.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - release-branch: master - dev-branch: developer - prefix: v. - - name: Dependencies run: sudo apt-get install libcurl4-openssl-dev From 4ada5c3e852c962bbd6c482e8bab6344453cf5ca Mon Sep 17 00:00:00 2001 From: dabumana Date: Thu, 13 Jul 2023 22:38:27 -0500 Subject: [PATCH 8/9] Update build.yml --- .github/workflows/build.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 68a08d9..53f8280 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,9 @@ name: Build on: push: - branches: ["main", "developer"] + branches: + - main + - developer pull_request: branches: ["main"] @@ -17,6 +19,9 @@ jobs: - name: Checkout uses: actions/checkout@v3 + with: + fetch-depth: 0 + persist-credentials: false - name: Version id: semantic From a2b2bbe3c8c7ccd32c874ad8a9c0c36dc48ed4aa Mon Sep 17 00:00:00 2001 From: dabumana Date: Thu, 13 Jul 2023 22:49:59 -0500 Subject: [PATCH 9/9] Update build.yml --- .github/workflows/build.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53f8280..4014144 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,14 +23,12 @@ jobs: fetch-depth: 0 persist-credentials: false - - name: Version - id: semantic - uses: codfish/semantic-release-action@v2.0.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - uses: go-semantic-release/action@v1 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} - name: Dependencies run: sudo apt-get install libcurl4-openssl-dev - name: Build - run: make build APP=caos VERSION=${{ steps.semantic.outputs.version }} + run: make build APP=caos