fix: Fix condition for choosing runner (#25779)
* fix: Fix condition for choosing runner * fix: Automate the GO_VERSION choice on server tests
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
63e4fccd3a
Коммит
f118b4f0ed
18
.github/workflows/server-test-template.yml
поставляемый
18
.github/workflows/server-test-template.yml
поставляемый
@@ -19,15 +19,16 @@ jobs:
|
|||||||
choose-runner:
|
choose-runner:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
outputs:
|
outputs:
|
||||||
runner: ${{ steps.step1.outputs.runner }}
|
runner: ${{ steps.determine-runner.outputs.runner }}
|
||||||
steps:
|
steps:
|
||||||
- name: Check branch
|
- name: test/check-if-contributor-pr
|
||||||
id: step1
|
id: determine-runner
|
||||||
run: |
|
run: |
|
||||||
if [ ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }} ]; then
|
if ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
|
||||||
echo "runner=ubuntu-latest-8-cores" >> "$GITHUB_OUTPUT"
|
then
|
||||||
else
|
echo "runner=ubuntu-latest-8-cores" >> "$GITHUB_OUTPUT"
|
||||||
echo "runner=ubuntu-latest" >> "$GITHUB_OUTPUT"
|
else
|
||||||
|
echo "runner=ubuntu-22.04" >> "$GITHUB_OUTPUT"
|
||||||
fi
|
fi
|
||||||
test:
|
test:
|
||||||
needs: choose-runner
|
needs: choose-runner
|
||||||
@@ -35,7 +36,6 @@ jobs:
|
|||||||
runs-on: ${{ needs.choose-runner.outputs.runner }}
|
runs-on: ${{ needs.choose-runner.outputs.runner }}
|
||||||
env:
|
env:
|
||||||
COMPOSE_PROJECT_NAME: ghactions
|
COMPOSE_PROJECT_NAME: ghactions
|
||||||
BUILD_IMAGE: mattermost/mattermost-build-server:20230904_golang-1.20.7
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout mattermost project
|
- name: Checkout mattermost project
|
||||||
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
|
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
|
||||||
@@ -56,6 +56,8 @@ jobs:
|
|||||||
docker compose --ansi never exec -T minio sh -c 'mkdir -p /data/mattermost-test';
|
docker compose --ansi never exec -T minio sh -c 'mkdir -p /data/mattermost-test';
|
||||||
docker compose --ansi never ps
|
docker compose --ansi never ps
|
||||||
- name: Run Tests
|
- name: Run Tests
|
||||||
|
env:
|
||||||
|
BUILD_IMAGE: mattermost/mattermost-build-server:${{ steps.go.outputs.GO_VERSION }}
|
||||||
run: |
|
run: |
|
||||||
if [[ ${{ github.ref_name }} == 'master' ]]; then
|
if [[ ${{ github.ref_name }} == 'master' ]]; then
|
||||||
export RACE_MODE="-race"
|
export RACE_MODE="-race"
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user