Remove protobuf dependencies (#17539)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 751ca95b1824896bc9bc6a1d11c5785a9d374459..a9ad9214578e2923193382fb685738da5df8756e 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -32,7 +32,7 @@ commands:
           name: Install system dependencies
           command: |
             sudo apt-get update
-            sudo apt-get install -y libicu-dev libidn11-dev libprotobuf-dev protobuf-compiler
+            sudo apt-get install -y libicu-dev libidn11-dev
   install-ruby-dependencies:
     parameters:
       ruby-version:

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 0aaea6b1fe26fbe62b72e619dda7b95f1434cae7..92a164c40e1c567ac133e96f66a7cc7711da0734 100644 (file)
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -6,6 +6,10 @@ on:
       - "main"
     tags:
       - "*"
+  pull_request:
+    paths:
+      - .github/workflows/build-image.yml
+      - Dockerfile
 jobs:
   build-image:
     runs-on: ubuntu-latest
@@ -30,7 +34,7 @@ jobs:
         with:
           context: .
           platforms: linux/amd64,linux/arm64
-          push: true
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           cache-from: type=registry,ref=tootsuite/mastodon:latest
           cache-to: type=inline

diff --git a/.github/workflows/check-i18n.yml b/.github/workflows/check-i18n.yml
index 2e8f230f312b80df0bf5f59e3e72a84eb55ee010..9cb98dd125641fce7da7311eff52c9f082027445 100644 (file)
--- a/.github/workflows/check-i18n.yml
+++ b/.github/workflows/check-i18n.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Install system dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y libicu-dev libidn11-dev libprotobuf-dev protobuf-compiler
+        sudo apt-get install -y libicu-dev libidn11-dev
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

diff --git a/Aptfile b/Aptfile
index b2cbad714d4dc9dd437ce49486523f8d1eed3aeb..9235141ad5e1d7dc2c894dec0d311de0adb92116 100644 (file)
--- a/Aptfile
+++ b/Aptfile
@@ -4,10 +4,8 @@ libicu-dev
 libidn11
 libidn11-dev
 libpq-dev
-libprotobuf-dev
 libxdamage1
 libxfixes3
-protobuf-compiler
 zlib1g-dev
 libcairo2
 libcroco3

diff --git a/Dockerfile b/Dockerfile
index c6287b5a7a6602ddeb48f4064ffd18cd77468646..1b3661561e71619b8d0f4f34cc5a85847644d224 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,7 +51,7 @@ RUN npm install -g npm@latest && \
        gem install bundler && \
        apt-get update && \
        apt-get install -y --no-install-recommends git libicu-dev libidn11-dev \
-       libpq-dev libprotobuf-dev protobuf-compiler shared-mime-info
+       libpq-dev shared-mime-info
 
 COPY Gemfile* package.json yarn.lock /opt/mastodon/
 
@@ -88,7 +88,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
 RUN apt-get update && \
   apt-get -y --no-install-recommends install \
          libssl1.1 libpq5 imagemagick ffmpeg libjemalloc2 \
-         libicu66 libprotobuf17 libidn11 libyaml-0-2 \
+         libicu66 libidn11 libyaml-0-2 \
          file ca-certificates tzdata libreadline8 gcc tini apt-utils && \
        ln -s /opt/mastodon /mastodon && \
        gem install bundler && \

diff --git a/Vagrantfile b/Vagrantfile
index e086ddd9877e61b611d6bc930112d06e4d3df682..3e73d9e470aa2b5727832400ec73f3dbd41efa34 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -33,11 +33,9 @@ sudo apt-get install \
   redis-tools \
   postgresql \
   postgresql-contrib \
-  protobuf-compiler \
   yarn \
   libicu-dev \
   libidn11-dev \
-  libprotobuf-dev \
   libreadline-dev \
   libpam0g-dev \
   -y