mirror of
https://github.com/matrix-org/dendrite.git
synced 2025-12-26 08:13:09 -06:00
Merge branch 'master' into fancy-cross
This commit is contained in:
commit
ff07aa473d
11
.github/workflows/docker-hub.yml
vendored
11
.github/workflows/docker-hub.yml
vendored
|
|
@ -7,7 +7,8 @@ on:
|
||||||
types: [published]
|
types: [published]
|
||||||
|
|
||||||
env:
|
env:
|
||||||
DOCKER_HUB_USER: matrixdotorg
|
DOCKER_NAMESPACE: matrixdotorg
|
||||||
|
DOCKER_HUB_USER: dendritegithub
|
||||||
PLATFORMS: linux/amd64,linux/arm64,linux/arm/v7
|
PLATFORMS: linux/amd64,linux/arm64,linux/arm/v7
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
@ -37,8 +38,8 @@ jobs:
|
||||||
platforms: ${{ env.PLATFORMS }}
|
platforms: ${{ env.PLATFORMS }}
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
${{ env.DOCKER_HUB_USER }}/dendrite-monolith:latest
|
${{ env.DOCKER_NAMESPACE }}/dendrite-monolith:latest
|
||||||
${{ env.DOCKER_HUB_USER }}/dendrite-monolith:${{ env.RELEASE_VERSION }}
|
${{ env.DOCKER_NAMESPACE }}/dendrite-monolith:${{ env.RELEASE_VERSION }}
|
||||||
|
|
||||||
Polylith:
|
Polylith:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
@ -66,5 +67,5 @@ jobs:
|
||||||
platforms: ${{ env.PLATFORMS }}
|
platforms: ${{ env.PLATFORMS }}
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
${{ env.DOCKER_HUB_USER }}/dendrite-polylith:latest
|
${{ env.DOCKER_NAMESPACE }}/dendrite-polylith:latest
|
||||||
${{ env.DOCKER_HUB_USER }}/dendrite-polylith:${{ env.RELEASE_VERSION }}
|
${{ env.DOCKER_NAMESPACE }}/dendrite-polylith:${{ env.RELEASE_VERSION }}
|
||||||
|
|
|
||||||
6
build.sh
6
build.sh
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/sh -eu
|
#!/bin/sh -eu
|
||||||
|
|
||||||
# Put installed packages into ./bin
|
# Put installed packages into ./bin
|
||||||
mkdir "./bin/"
|
export GOBIN=$PWD/`dirname $0`/bin
|
||||||
|
|
||||||
if [ -d ".git" ]
|
if [ -d ".git" ]
|
||||||
then
|
then
|
||||||
|
|
@ -17,6 +17,8 @@ else
|
||||||
export FLAGS=""
|
export FLAGS=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CGO_ENABLED=1 go build -trimpath -ldflags "$FLAGS" -v -o "./bin/" ./cmd/...
|
mkdir -p bin
|
||||||
|
|
||||||
|
CGO_ENABLED=1 go build -trimpath -ldflags "$FLAGS" -v -o "bin/" ./cmd/...
|
||||||
|
|
||||||
CGO_ENABLED=0 GOOS=js GOARCH=wasm go build -trimpath -ldflags "$FLAGS" -o bin/main.wasm ./cmd/dendritejs
|
CGO_ENABLED=0 GOOS=js GOARCH=wasm go build -trimpath -ldflags "$FLAGS" -o bin/main.wasm ./cmd/dendritejs
|
||||||
Loading…
Reference in a new issue