Skip to content

Commit b81256c

Browse files
Update tests-passed -> latest (#1002)
https://meta.discourse.org/t/383536
1 parent e003ee6 commit b81256c

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

.github/workflows/push-web-only.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
version:
1414
runs-on: ubuntu-latest
1515
outputs:
16-
tests-passed: ${{ steps.latest.outputs.version }}
16+
latest: ${{ steps.latest.outputs.version }}
1717
stable: ${{ steps.stable.outputs.version }}
1818
steps:
1919
- uses: ruby/setup-ruby@v1
@@ -23,9 +23,9 @@ jobs:
2323
uses: actions/checkout@v4
2424
with:
2525
repository: discourse/discourse
26-
ref: tests-passed
26+
ref: latest
2727
fetch-depth: 1
28-
path: 'tests-passed'
28+
path: 'latest'
2929
- name: checkout stable
3030
uses: actions/checkout@v4
3131
with:
@@ -34,7 +34,7 @@ jobs:
3434
fetch-depth: 1
3535
path: 'stable'
3636
- id: latest
37-
working-directory: tests-passed
37+
working-directory: latest
3838
run: |
3939
version=$(ruby -r ./lib/version.rb -e "puts ::Discourse::VERSION::STRING")
4040
echo "version=$version"
@@ -49,14 +49,14 @@ jobs:
4949
push:
5050
strategy:
5151
matrix:
52-
version: [tests-passed,stable]
52+
version: [latest,stable]
5353
os: [ubuntu-latest, ubuntu-24.04-arm]
5454
runs-on: ${{ matrix.os }}
5555
needs: version
5656
env:
5757
ARCH: ${{ matrix.os == 'ubuntu-24.04-arm' && 'arm64' || 'amd64' }}
58-
FLOATING_TAG: ${{ matrix.version == 'tests-passed' && 'latest' || matrix.version }}-${{ matrix.os == 'ubuntu-24.04-arm' && 'arm64' || 'amd64' }}
59-
TAG: ${{ matrix.version == 'stable' && needs.version.outputs.stable || needs.version.outputs.tests-passed }}-${{ matrix.os == 'ubuntu-24.04-arm' && 'arm64' || 'amd64' }}
58+
FLOATING_TAG: ${{ matrix.version == 'latest' && 'latest' || matrix.version }}-${{ matrix.os == 'ubuntu-24.04-arm' && 'arm64' || 'amd64' }}
59+
TAG: ${{ matrix.version == 'stable' && needs.version.outputs.stable || needs.version.outputs.latest }}-${{ matrix.os == 'ubuntu-24.04-arm' && 'arm64' || 'amd64' }}
6060
steps:
6161
- uses: actions/checkout@v4
6262
with:
@@ -110,10 +110,10 @@ jobs:
110110
docker manifest push ${{ env.DOCKER_REPO }}:stable
111111
112112
docker manifest create \
113-
${{ env.DOCKER_REPO }}:${{ needs.version.outputs.tests-passed }} \
114-
--amend ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.tests-passed }}-amd64 \
115-
--amend ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.tests-passed }}-arm64
116-
docker manifest push ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.tests-passed }}
113+
${{ env.DOCKER_REPO }}:${{ needs.version.outputs.latest }} \
114+
--amend ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.latest }}-amd64 \
115+
--amend ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.latest }}-arm64
116+
docker manifest push ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.latest }}
117117
118118
docker manifest create \
119119
${{ env.DOCKER_REPO }}:${{ needs.version.outputs.stable }} \

samples/standalone.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ params:
3333
## can improve sorting performance, but adds memory usage per-connection
3434
#db_work_mem: "40MB"
3535

36-
## Which Git revision should this container use? (default: tests-passed)
37-
#version: tests-passed
36+
## Which Git revision should this container use? (default: latest)
37+
#version: latest
3838

3939
env:
4040
LC_ALL: en_US.UTF-8

samples/web_only.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ links:
2525
# docker_args:
2626

2727
params:
28-
## Which Git revision should this container use? (default: tests-passed)
29-
#version: tests-passed
28+
## Which Git revision should this container use? (default: latest)
29+
#version: latest
3030

3131
env:
3232
LC_ALL: en_US.UTF-8

templates/web.template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
DISCOURSE_DB_PORT:
1515

1616
params:
17-
version: tests-passed
17+
version: latest
1818
home: /var/www/discourse
1919
upload_size: 10m
2020
nginx_worker_connections: 4000

0 commit comments

Comments
 (0)