drop public submodule replace directive (#24045)

* drop public submodule replace directive

During development of the public/ submodule, a replace directive remained that was both unnecessary and harmful as discussed in https://community.mattermost.com/private-core/pl/w77sh7igwpfb9ecj5o4jjjbbyo.

Remove that, and bump the explicit dependency (even though we use go.work) to v0.0.6 so the import paths match (e.g. `mattermost` vs `mattermost-server`).

* make modules-tidy

* consistently setup-go-work

* fix build-api-spec

* fix mmctl test template

* fix workflow copy/paste typo
This commit is contained in:
Jesse Hallam
2023-07-20 10:45:06 -03:00
committed by GitHub
parent 949a7875cd
commit 6c821c8b13
4 changed files with 31 additions and 8 deletions

View File

@@ -30,6 +30,10 @@ jobs:
uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
with:
go-version: ${{ env.go-version }}
- name: Run setup-go-work
run: |
cd server
make setup-go-work
- name: Run docker compose
run: |
cd server/build

View File

@@ -47,6 +47,8 @@ jobs:
cache-dependency-path: |
server/go.sum
server/public/go.sum
- name: Run setup-go-work
run: make setup-go-work
- name: Run go mod tidy
run: make modules-tidy
- name: Check modules
@@ -67,7 +69,7 @@ jobs:
cache-dependency-path: |
server/go.sum
server/public/go.sum
- name: Setup go.work
- name: Run setup-go-work
run: make setup-go-work
- name: Run golangci
run: make golangci-lint
@@ -87,6 +89,8 @@ jobs:
cache-dependency-path: |
server/go.sum
server/public/go.sum
- name: Run setup-go-work
run: make setup-go-work
- name: Run make-gen-serialized
run: make gen-serialized
- name: Check serialized
@@ -107,10 +111,10 @@ jobs:
cache-dependency-path: |
server/go.sum
server/public/go.sum
- name: Reset config
run: make config-reset
- name: Run setup-go-work
run: make setup-go-work
- name: Reset config
run: make config-reset
- name: Run plugin-checker
run: make plugin-checker
- name: Run mattermost-vet
@@ -131,6 +135,9 @@ jobs:
build-api-spec:
name: Build API specification
runs-on: ubuntu-22.04
defaults:
run:
working-directory: server
steps:
- name: Checkout mattermost project
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
@@ -141,9 +148,11 @@ jobs:
cache-dependency-path: |
server/go.sum
server/public/go.sum
- name: Run setup-go-work
run: make setup-go-work
- name: Checkout mattermost-api-reference
run: |
cd ..
cd ../..
git clone --depth=1 --no-single-branch https://github.com/mattermost/mattermost-api-reference.git
cd mattermost-api-reference
echo "Trying to checkout the same branch on mattermost-api-reference as mattermost"
@@ -181,6 +190,8 @@ jobs:
cache-dependency-path: |
server/go.sum
server/public/go.sum
- name: Run setup-go-work
run: make setup-go-work
- name: Generate store layers
run: make store-layers
- name: Check generated code
@@ -201,6 +212,8 @@ jobs:
cache-dependency-path: |
server/go.sum
server/public/go.sum
- name: Run setup-go-work
run: make setup-go-work
- name: Generate app layers
run: make app-layers
- name: Check generated code
@@ -208,6 +221,9 @@ jobs:
check-mmctl-docs:
name: Check mmctl docs
runs-on: ubuntu-22.04
defaults:
run:
working-directory: server
steps:
- name: Checkout mattermost-server
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
@@ -218,10 +234,11 @@ jobs:
cache-dependency-path: |
server/go.sum
server/public/go.sum
- name: Run setup-go-work
run: make setup-go-work
- name: Check docs
run: |
echo "Making sure docs are updated"
cd server
make mmctl-docs
if [[ -n $(git status --porcelain) ]]; then echo "Please update the mmctl docs using make mmctl-docs"; exit 1; fi
test-postgres-binary:
@@ -281,6 +298,8 @@ jobs:
cache-dependency-path: |
server/go.sum
server/public/go.sum
- name: Run setup-go-work
run: make setup-go-work
- name: Build
run: |
make config-reset