From f97f0a3d68a8adba4da287b5b66b616ab3b8ceab Mon Sep 17 00:00:00 2001 From: Yuri Shangaraev Date: Fri, 17 Jan 2025 11:09:46 +0500 Subject: [PATCH 1/7] add .vscode --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index f3d7fbd..15c0050 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ extTestApps/Wissance.Auth.FerrumChecker/.vs/ extTestApps/Wissance.Auth.FerrumChecker/Wissance.Auth.FerrumChecker/bin/ extTestApps/Wissance.Auth.FerrumChecker/Wissance.Auth.FerrumChecker/obj/ + +.vscode/ \ No newline at end of file From 4e1ee54b312be64d41842ae23c8953d0635d34a5 Mon Sep 17 00:00:00 2001 From: Yuri Shangaraev Date: Fri, 17 Jan 2025 11:18:40 +0500 Subject: [PATCH 2/7] fixes --- .github/workflow/ci.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflow/ci.yml b/.github/workflow/ci.yml index abc620f..8effb59 100644 --- a/.github/workflow/ci.yml +++ b/.github/workflow/ci.yml @@ -3,8 +3,8 @@ name: Go CI on: push: branches: - - 'main' - - 'develop' + - main + - develop jobs: build-linux: @@ -15,10 +15,10 @@ jobs: - name: Set up Go uses: actions/setup-go@v5.0.2 with: - go-version: '1.18' + go-version: '1.19' cache: false - name: Build - run: go build -v ./... + run: go mod tidy && go build -v ./... build-windows: name: Build Ferrum on windows @@ -28,10 +28,10 @@ jobs: - name: Set up Go uses: actions/setup-go@v5.0.2 with: - go-version: '1.18' + go-version: '1.19' cache: false - name: Build - run: go build -v ./... + run: go mod tidy && go build -v ./... all-tests-linux: name: Run all tests on linux @@ -40,6 +40,9 @@ jobs: - uses: actions/checkout@v4.1.7 - name: Set up Go uses: actions/setup-go@v5.0.2 + with: + go-version: '1.19' + cache: false - name: Set up Redis Stack server run: docker compose up -d redis - name: Get Redis logs From 82d3648908c0f4c763ea2ff29fe0d424110683fa Mon Sep 17 00:00:00 2001 From: Yuri Shangaraev Date: Fri, 17 Jan 2025 11:22:14 +0500 Subject: [PATCH 3/7] fix --- .github/workflow/ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflow/ci.yml b/.github/workflow/ci.yml index 8effb59..d5c453b 100644 --- a/.github/workflow/ci.yml +++ b/.github/workflow/ci.yml @@ -1,10 +1,8 @@ name: Go CI -on: - push: - branches: - - main - - develop +on: + pull_request: + branches: [develop] jobs: build-linux: From c194d51065e682eb636fc004e6ebd1a66ede82f4 Mon Sep 17 00:00:00 2001 From: Yuri Shangaraev Date: Fri, 17 Jan 2025 11:23:29 +0500 Subject: [PATCH 4/7] workflow -> workflows --- .github/{workflow => workflows}/ci.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{workflow => workflows}/ci.yml (100%) diff --git a/.github/workflow/ci.yml b/.github/workflows/ci.yml similarity index 100% rename from .github/workflow/ci.yml rename to .github/workflows/ci.yml From 9d521d188159fe73c0376a0aabbdcd85fa52de7f Mon Sep 17 00:00:00 2001 From: Yuri Shangaraev Date: Fri, 17 Jan 2025 11:29:30 +0500 Subject: [PATCH 5/7] workflow -> workflows --- .github/workflows/ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5c453b..1f400fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,8 +1,11 @@ name: Go CI -on: - pull_request: - branches: [develop] +on: + push: + branches: + - main + - develop + - master jobs: build-linux: @@ -13,10 +16,10 @@ jobs: - name: Set up Go uses: actions/setup-go@v5.0.2 with: - go-version: '1.19' + go-version: '1.18' cache: false - name: Build - run: go mod tidy && go build -v ./... + run: go build -v ./... build-windows: name: Build Ferrum on windows @@ -26,10 +29,10 @@ jobs: - name: Set up Go uses: actions/setup-go@v5.0.2 with: - go-version: '1.19' + go-version: '1.18' cache: false - name: Build - run: go mod tidy && go build -v ./... + run: go build -v ./... all-tests-linux: name: Run all tests on linux @@ -38,9 +41,6 @@ jobs: - uses: actions/checkout@v4.1.7 - name: Set up Go uses: actions/setup-go@v5.0.2 - with: - go-version: '1.19' - cache: false - name: Set up Redis Stack server run: docker compose up -d redis - name: Get Redis logs From ad2926abc58711a20ef688319b6364e273787eb8 Mon Sep 17 00:00:00 2001 From: Yuri Shangaraev Date: Fri, 17 Jan 2025 11:30:37 +0500 Subject: [PATCH 6/7] on pr --- .github/workflows/ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f400fd..d5c453b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,11 +1,8 @@ name: Go CI -on: - push: - branches: - - main - - develop - - master +on: + pull_request: + branches: [develop] jobs: build-linux: @@ -16,10 +13,10 @@ jobs: - name: Set up Go uses: actions/setup-go@v5.0.2 with: - go-version: '1.18' + go-version: '1.19' cache: false - name: Build - run: go build -v ./... + run: go mod tidy && go build -v ./... build-windows: name: Build Ferrum on windows @@ -29,10 +26,10 @@ jobs: - name: Set up Go uses: actions/setup-go@v5.0.2 with: - go-version: '1.18' + go-version: '1.19' cache: false - name: Build - run: go build -v ./... + run: go mod tidy && go build -v ./... all-tests-linux: name: Run all tests on linux @@ -41,6 +38,9 @@ jobs: - uses: actions/checkout@v4.1.7 - name: Set up Go uses: actions/setup-go@v5.0.2 + with: + go-version: '1.19' + cache: false - name: Set up Redis Stack server run: docker compose up -d redis - name: Get Redis logs From 327a8030d9b23a3c805683c9176cbab0a5f7b2b6 Mon Sep 17 00:00:00 2001 From: Yuri Shangaraev Date: Fri, 17 Jan 2025 11:31:23 +0500 Subject: [PATCH 7/7] restore --- .github/workflows/ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5c453b..1f400fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,8 +1,11 @@ name: Go CI -on: - pull_request: - branches: [develop] +on: + push: + branches: + - main + - develop + - master jobs: build-linux: @@ -13,10 +16,10 @@ jobs: - name: Set up Go uses: actions/setup-go@v5.0.2 with: - go-version: '1.19' + go-version: '1.18' cache: false - name: Build - run: go mod tidy && go build -v ./... + run: go build -v ./... build-windows: name: Build Ferrum on windows @@ -26,10 +29,10 @@ jobs: - name: Set up Go uses: actions/setup-go@v5.0.2 with: - go-version: '1.19' + go-version: '1.18' cache: false - name: Build - run: go mod tidy && go build -v ./... + run: go build -v ./... all-tests-linux: name: Run all tests on linux @@ -38,9 +41,6 @@ jobs: - uses: actions/checkout@v4.1.7 - name: Set up Go uses: actions/setup-go@v5.0.2 - with: - go-version: '1.19' - cache: false - name: Set up Redis Stack server run: docker compose up -d redis - name: Get Redis logs