Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/push-web-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
version:
runs-on: ubuntu-latest
outputs:
tests-passed: ${{ steps.latest.outputs.version }}
latest: ${{ steps.latest.outputs.version }}
stable: ${{ steps.stable.outputs.version }}
steps:
- uses: ruby/setup-ruby@v1
Expand All @@ -23,9 +23,9 @@ jobs:
uses: actions/checkout@v4
with:
repository: discourse/discourse
ref: tests-passed
ref: latest
fetch-depth: 1
path: 'tests-passed'
path: 'latest'
- name: checkout stable
uses: actions/checkout@v4
with:
Expand All @@ -34,7 +34,7 @@ jobs:
fetch-depth: 1
path: 'stable'
- id: latest
working-directory: tests-passed
working-directory: latest
run: |
version=$(ruby -r ./lib/version.rb -e "puts ::Discourse::VERSION::STRING")
echo "version=$version"
Expand All @@ -49,14 +49,14 @@ jobs:
push:
strategy:
matrix:
version: [tests-passed,stable]
version: [latest,stable]
os: [ubuntu-latest, ubuntu-24.04-arm]
runs-on: ${{ matrix.os }}
needs: version
env:
ARCH: ${{ matrix.os == 'ubuntu-24.04-arm' && 'arm64' || 'amd64' }}
FLOATING_TAG: ${{ matrix.version == 'tests-passed' && 'latest' || matrix.version }}-${{ matrix.os == 'ubuntu-24.04-arm' && 'arm64' || 'amd64' }}
TAG: ${{ matrix.version == 'stable' && needs.version.outputs.stable || needs.version.outputs.tests-passed }}-${{ matrix.os == 'ubuntu-24.04-arm' && 'arm64' || 'amd64' }}
FLOATING_TAG: ${{ matrix.version == 'latest' && 'latest' || matrix.version }}-${{ matrix.os == 'ubuntu-24.04-arm' && 'arm64' || 'amd64' }}
TAG: ${{ matrix.version == 'stable' && needs.version.outputs.stable || needs.version.outputs.latest }}-${{ matrix.os == 'ubuntu-24.04-arm' && 'arm64' || 'amd64' }}
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -110,10 +110,10 @@ jobs:
docker manifest push ${{ env.DOCKER_REPO }}:stable

docker manifest create \
${{ env.DOCKER_REPO }}:${{ needs.version.outputs.tests-passed }} \
--amend ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.tests-passed }}-amd64 \
--amend ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.tests-passed }}-arm64
docker manifest push ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.tests-passed }}
${{ env.DOCKER_REPO }}:${{ needs.version.outputs.latest }} \
--amend ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.latest }}-amd64 \
--amend ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.latest }}-arm64
docker manifest push ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.latest }}

docker manifest create \
${{ env.DOCKER_REPO }}:${{ needs.version.outputs.stable }} \
Expand Down
4 changes: 2 additions & 2 deletions samples/standalone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ params:
## can improve sorting performance, but adds memory usage per-connection
#db_work_mem: "40MB"

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

env:
LC_ALL: en_US.UTF-8
Expand Down
4 changes: 2 additions & 2 deletions samples/web_only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ links:
# docker_args:

params:
## Which Git revision should this container use? (default: tests-passed)
#version: tests-passed
## Which Git revision should this container use? (default: latest)
#version: latest

env:
LC_ALL: en_US.UTF-8
Expand Down
2 changes: 1 addition & 1 deletion templates/web.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
DISCOURSE_DB_PORT:

params:
version: tests-passed
version: latest
home: /var/www/discourse
upload_size: 10m
nginx_worker_connections: 4000
Expand Down
Loading