From 794307556f7c75e8948395358465fcd7fee823bd Mon Sep 17 00:00:00 2001 From: Mustafa Kara Date: Mon, 25 Jul 2022 17:01:29 +0300 Subject: [PATCH 1/5] Fix lint pipeline to fetch enterprise repo Signed-off-by: Mustafa Kara --- .github/workflows/lint-server.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/lint-server.yml b/.github/workflows/lint-server.yml index 4ffc48a12..aaf522ff6 100644 --- a/.github/workflows/lint-server.yml +++ b/.github/workflows/lint-server.yml @@ -7,6 +7,12 @@ on: branches: [ main, release-** ] workflow_dispatch: +<<<<<<< Updated upstream +======= +env: + BRANCH_NAME: ${{ github.head_ref || github.ref_name }} + +>>>>>>> Stashed changes jobs: golangci: name: plugin @@ -16,6 +22,24 @@ jobs: with: go-version: 1.18.1 - uses: actions/checkout@v3 +<<<<<<< Updated upstream +======= + with: + path: "focalboard" + - id: "mattermostServer" + uses: actions/checkout@v3 + continue-on-error: true + with: + repository: "mattermost/mattermost-server" + path: "mattermost-server" + ref: ${{ env.BRANCH_NAME }} + - uses: actions/checkout@v3 + if: steps.mattermostServer.outcome == 'failure' + with: + repository: "mattermost/mattermost-server" + path: "mattermost-server" + ref : "master" +>>>>>>> Stashed changes - name: set up golangci-lint run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.46.2 - name: lint From b3f28693f1ebfe8d7791dcad0c4c2e238cb9f7e2 Mon Sep 17 00:00:00 2001 From: Mustafa Kara Date: Mon, 25 Jul 2022 17:05:04 +0300 Subject: [PATCH 2/5] Update lint-server.yml --- .github/workflows/lint-server.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/lint-server.yml b/.github/workflows/lint-server.yml index aaf522ff6..f50a019ad 100644 --- a/.github/workflows/lint-server.yml +++ b/.github/workflows/lint-server.yml @@ -7,12 +7,9 @@ on: branches: [ main, release-** ] workflow_dispatch: -<<<<<<< Updated upstream -======= env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} ->>>>>>> Stashed changes jobs: golangci: name: plugin @@ -22,8 +19,6 @@ jobs: with: go-version: 1.18.1 - uses: actions/checkout@v3 -<<<<<<< Updated upstream -======= with: path: "focalboard" - id: "mattermostServer" @@ -39,7 +34,6 @@ jobs: repository: "mattermost/mattermost-server" path: "mattermost-server" ref : "master" ->>>>>>> Stashed changes - name: set up golangci-lint run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.46.2 - name: lint From 4fa713d75b5048c80a69f4e62d34d593f44ee5d4 Mon Sep 17 00:00:00 2001 From: Mustafa Kara Date: Mon, 25 Jul 2022 17:08:02 +0300 Subject: [PATCH 3/5] Fix pipeline code Signed-off-by: Mustafa Kara --- .github/workflows/lint-server.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint-server.yml b/.github/workflows/lint-server.yml index f50a019ad..89c304c53 100644 --- a/.github/workflows/lint-server.yml +++ b/.github/workflows/lint-server.yml @@ -37,4 +37,6 @@ jobs: - name: set up golangci-lint run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.46.2 - name: lint - run: make server-lint + run: | + cd focalboard + make server-lint From ea37064e9441edae5901753f96e2fa50b69d296e Mon Sep 17 00:00:00 2001 From: Mustafa Kara Date: Tue, 26 Jul 2022 11:28:58 +0300 Subject: [PATCH 4/5] Update .github/workflows/lint-server.yml Co-authored-by: Akis Maziotis <36594156+phoinixgrr@users.noreply.github.com> --- .github/workflows/lint-server.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/lint-server.yml b/.github/workflows/lint-server.yml index 89c304c53..35c5327a8 100644 --- a/.github/workflows/lint-server.yml +++ b/.github/workflows/lint-server.yml @@ -26,6 +26,7 @@ jobs: continue-on-error: true with: repository: "mattermost/mattermost-server" + fetch-depth: "20" path: "mattermost-server" ref: ${{ env.BRANCH_NAME }} - uses: actions/checkout@v3 From ba73ab082dac12b629278797f3c4c250c916043c Mon Sep 17 00:00:00 2001 From: Mustafa Kara Date: Tue, 26 Jul 2022 11:29:08 +0300 Subject: [PATCH 5/5] Update .github/workflows/lint-server.yml Co-authored-by: Akis Maziotis <36594156+phoinixgrr@users.noreply.github.com> --- .github/workflows/lint-server.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/lint-server.yml b/.github/workflows/lint-server.yml index 35c5327a8..ab55a3308 100644 --- a/.github/workflows/lint-server.yml +++ b/.github/workflows/lint-server.yml @@ -33,6 +33,7 @@ jobs: if: steps.mattermostServer.outcome == 'failure' with: repository: "mattermost/mattermost-server" + fetch-depth: "20" path: "mattermost-server" ref : "master" - name: set up golangci-lint