Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge changes of 4.0.7..4.0.10 #1324

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
8695409
Fix trending publishers table not rendering correctly on narrow scree…
vmstan Jul 13, 2023
bd2429b
Fix remote accounts being possibly persisted to database with incompl…
ClearlyClaire Jul 10, 2023
73b16b6
Fix moderation interface for remote instances with a .zip TLD (#25885)
ClearlyClaire Jul 10, 2023
aca0db4
Change request timeout handling to use a longer deadline (#26055)
ClearlyClaire Jul 18, 2023
fc4a93b
Fix CSP headers being unintendedly wide (#26105)
ClearlyClaire Jul 21, 2023
c46aa23
Add check preventing Sidekiq workers from running with Makara configu…
ClearlyClaire Jul 21, 2023
10fccce
Bump version to v4.0.7
ClearlyClaire Jul 21, 2023
f52763d
Fix wrong filters sometimes applying in streaming (#26159)
ClearlyClaire Jul 27, 2023
663f801
Refactor streaming's filtering logic & improve documentation (#26213)
ThisIsMissEm Jul 27, 2023
fea5640
Fix incorrect connect timeout in outgoing requests (#26116)
ClearlyClaire Jul 22, 2023
8018d47
Fix: Streaming server memory leak in HTTP EventSource cleanup (#26228)
ThisIsMissEm Jul 28, 2023
879b8b6
Fix missing return values in streaming (#26233)
renchap Jul 28, 2023
e3c57f1
Bump version to v4.0.8
ClearlyClaire Jul 28, 2023
7582dce
Merge tag 'v4.0.8' into upstream-changes-from-4-0-x
nachtjasmin Aug 1, 2023
2b0cabe
Backport container build changes to the stable-4.0 branch (#26741)
ClearlyClaire Aug 31, 2023
a62d9a9
Change text extraction in `PlainTextFormatter` to be faster (#26727)
ClearlyClaire Aug 30, 2023
d30fbc0
Fix blocking subdomains of an already-blocked domain (#26392)
ClearlyClaire Aug 9, 2023
db8db60
Fix `/api/v1/timelines/tag/:hashtag` allowing for unauthenticated acc…
danielmbrasil Aug 31, 2023
d3e97e8
Allow reports with long comments from remote instances, but truncate …
ThisIsMissEm May 22, 2023
48fbb9d
Fix Dockerfile installing incompatible npm version (#26803)
ClearlyClaire Sep 5, 2023
a9915c5
Bump version to v4.0.9
ClearlyClaire Sep 5, 2023
7df732e
Update actions for stable-4.0 (#26813)
ClearlyClaire Sep 6, 2023
75400ab
Change Dockerfile to upgrade packages when building (#26930)
ClearlyClaire Sep 18, 2023
9fa89db
Merge pull request from GHSA-2693-xr3m-jhqr
ClearlyClaire Sep 19, 2023
9ae857c
Merge pull request from GHSA-v3xf-c9qf-j667
ClearlyClaire Sep 19, 2023
bc4408d
Fix unexpected audio stream transcoding when uploaded video is eligib…
yufushiro Aug 23, 2023
871e63e
Fix `frame_rate` for videos where `ffprobe` reports 0/0 (#26500)
NicolaiSoeborg Aug 18, 2023
3ab722a
Fix cached posts including stale stats (#26409)
ClearlyClaire Aug 17, 2023
57acad0
Fix crash when encountering invalid URL (#26814)
ClearlyClaire Sep 6, 2023
5c64f01
Fix moderator rights inconsistencies (#26729)
ClearlyClaire Sep 6, 2023
3d8ae6a
Bump version to v4.0.10
ClearlyClaire Sep 19, 2023
8748898
Merge tag 'v4.0.9' into upstream-changes-from-4-0-x
nachtjasmin Sep 19, 2023
3807d01
Merge tag 'v4.0.10' into upstream-changes-from-4-0-x
nachtjasmin Sep 19, 2023
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
225 changes: 0 additions & 225 deletions .circleci/config.yml

This file was deleted.

92 changes: 92 additions & 0 deletions .github/workflows/build-container-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
on:
workflow_call:
inputs:
platforms:
required: true
type: string
cache:
type: boolean
default: true
use_native_arm64_builder:
type: boolean
push_to_images:
type: string
flavor:
type: string
tags:
type: string
labels:
type: string

jobs:
build-image:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- uses: docker/setup-qemu-action@v2
if: contains(inputs.platforms, 'linux/arm64') && !inputs.use_native_arm64_builder

- uses: docker/setup-buildx-action@v2
id: buildx
if: ${{ !(inputs.use_native_arm64_builder && contains(inputs.platforms, 'linux/arm64')) }}

- name: Start a local Docker Builder
if: inputs.use_native_arm64_builder && contains(inputs.platforms, 'linux/arm64')
run: |
docker run --rm -d --name buildkitd -p 1234:1234 --privileged moby/buildkit:latest --addr tcp://0.0.0.0:1234

- uses: docker/setup-buildx-action@v2
id: buildx-native
if: inputs.use_native_arm64_builder && contains(inputs.platforms, 'linux/arm64')
with:
driver: remote
endpoint: tcp://localhost:1234
platforms: linux/amd64
append: |
- endpoint: tcp://${{ vars.DOCKER_BUILDER_HETZNER_ARM64_01_HOST }}:13865
platforms: linux/arm64
name: mastodon-docker-builder-arm64-01
driver-opts:
- servername=mastodon-docker-builder-arm64-01
env:
BUILDER_NODE_1_AUTH_TLS_CACERT: ${{ secrets.DOCKER_BUILDER_HETZNER_ARM64_01_CACERT }}
BUILDER_NODE_1_AUTH_TLS_CERT: ${{ secrets.DOCKER_BUILDER_HETZNER_ARM64_01_CERT }}
BUILDER_NODE_1_AUTH_TLS_KEY: ${{ secrets.DOCKER_BUILDER_HETZNER_ARM64_01_KEY }}

- name: Log in to Docker Hub
if: contains(inputs.push_to_images, 'tootsuite')
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Log in to the Github Container registry
if: contains(inputs.push_to_images, 'ghcr.io')
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- uses: docker/metadata-action@v4
id: meta
if: ${{ inputs.push_to_images != '' }}
with:
images: ${{ inputs.push_to_images }}
flavor: ${{ inputs.flavor }}
tags: ${{ inputs.tags }}
labels: ${{ inputs.labels }}

- uses: docker/build-push-action@v4
with:
context: .
platforms: ${{ inputs.platforms }}
provenance: false
builder: ${{ steps.buildx.outputs.name || steps.buildx-native.outputs.name }}
push: ${{ inputs.push_to_images != '' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: ${{ inputs.cache && 'type=gha' || '' }}
cache-to: ${{ inputs.cache && 'type=gha,mode=max' || '' }}
64 changes: 0 additions & 64 deletions .github/workflows/build-image.yml

This file was deleted.

Loading