Revert "Add basic es tests (#12)"

This reverts commit 02c4a11.

.bundler-audit.yml

@@ -0,0 +1,3 @@
+---
+ignore:
+ - CVE-2015-9284 # Mitigation following https://github.com/omniauth/omniauth/wiki/Resolving-CVE-2015-9284#mitigating-in-rails-applications

.devcontainer/devcontainer.json

@@ -1,29 +1,31 @@
+// For more details, see https://aka.ms/devcontainer.json.
 {
  "name": "Mastodon",
  "dockerComposeFile": "docker-compose.yml",
  "service": "app",
  "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 
+ // Features to add to the dev container. More info: https://containers.dev/features.
  "features": {
  "ghcr.io/devcontainers/features/sshd:1": {}
  },
 
- "runServices": ["app", "db", "redis"],
-
+ // Use 'forwardPorts' to make a list of ports inside the container available locally.
+ // This can be used to network with other containers or the host.
  "forwardPorts": [3000, 4000],
 
- "containerEnv": {
- "ES_ENABLED": "",
- "LIBRE_TRANSLATE_ENDPOINT": ""
- },
-
+ // Use 'postCreateCommand' to run commands after the container is created.
  "onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
  "postCreateCommand": ".devcontainer/post-create.sh",
  "waitFor": "postCreateCommand",
 
+ // Configure tool-specific properties.
  "customizations": {
+ // Configure properties specific to VS Code.
  "vscode": {
+ // Set *default* container specific settings.json values on container create.
  "settings": {},
+ // Add the IDs of extensions you want installed when the container is created.
  "extensions": ["EditorConfig.EditorConfig", "webben.browserslist"]
  }
  }

.github/renovate.json5

@@ -1,21 +1,20 @@
 {
  $schema: 'https://docs.renovatebot.com/renovate-schema.json',
  extends: [
- 'config:recommended',
+ 'config:base',
+ ':dependencyDashboard',
  ':labels(dependencies)',
  ':maintainLockFilesMonthly', // update non-direct dependencies monthly
- ':prConcurrentLimitNone', // Remove limit for open PRs at any time.
- ':prHourlyLimit2', // Rate limit PR creation to a maximum of two per hour.
+ ':prConcurrentLimit10', // only 10 open PRs at the same time
  ],
- minimumReleaseAge: '3', // Wait 3 days after the package has been published before upgrading it
+ stabilityDays: 3, // Wait 3 days after the package has been published before upgrading it
  // packageRules order is important, they are applied from top to bottom and are merged,
  // meaning the most important ones must be at the bottom, for example grouping rules
  // If we do not want a package to be grouped with others, we need to set its groupName
  // to `null` after any other rule set it to something.
- dependencyDashboardHeader: 'This issue lists Renovate updates and detected dependencies. Read the [Dependency Dashboard](https://docs.renovatebot.com/key-concepts/dashboard/) docs to learn more. Before approving any upgrade: read the description and comments in the [`renovate.json5` file](https://github.com/mastodon/mastodon/blob/main/.github/renovate.json5).',
  packageRules: [
  {
- // Require Dependency Dashboard Approval for major version bumps of these node packages
+ // Ignore major version bumps for these node packages
  matchManagers: ['npm'],
  matchPackageNames: [
  'tesseract.js', // Requires code changes
@@ -42,10 +41,10 @@
  'react-router-dom',
  ],
  matchUpdateTypes: ['major'],
- dependencyDashboardApproval: true,
+ enabled: false,
  },
  {
- // Require Dependency Dashboard Approval for major version bumps of these Ruby packages
+ // Ignore major version bumps for these Ruby packages
  matchManagers: ['bundler'],
  matchPackageNames: [
  'rack', // Needs to be synced with Rails version
@@ -56,33 +55,33 @@
  'redis', // Requires manual upgrade and sync with Sidekiq version
  ],
  matchUpdateTypes: ['major'],
- dependencyDashboardApproval: true,
+ enabled: false,
  },
  {
  // Update Github Actions and Docker images weekly
  matchManagers: ['github-actions', 'dockerfile', 'docker-compose'],
  extends: ['schedule:weekly'],
  },
  {
- // Require Dependency Dashboard Approval for major & minor bumps for the ruby image, this needs to be synced with .ruby-version
+ // Ignore major & minor bumps for the ruby image, this needs to be synced with .ruby-version
  matchManagers: ['dockerfile'],
  matchPackageNames: ['moritzheiber/ruby-jemalloc'],
  matchUpdateTypes: ['minor', 'major'],
- dependencyDashboardApproval: true,
+ enabled: false,
  },
  {
- // Require Dependency Dashboard Approval for major bumps for the node image, this needs to be synced with .nvmrc
+ // Ignore major bump for the node image, this needs to be synced with .nvmrc
  matchManagers: ['dockerfile'],
  matchPackageNames: ['node'],
  matchUpdateTypes: ['major'],
- dependencyDashboardApproval: true,
+ enabled: false,
  },
  {
- // Require Dependency Dashboard Approval for major postgres bumps in the docker-compose file, as those break dev environments
+ // Ignore major postgres bumps in the docker-compose file, as those break dev environments
  matchManagers: ['docker-compose'],
  matchPackageNames: ['postgres'],
  matchUpdateTypes: ['major'],
- dependencyDashboardApproval: true,
+ enabled: false,
  },
  {
  // Update devDependencies every week, with one grouped PR

.github/workflows/build-container-image.yml

@@ -8,9 +8,7 @@ on:
  type: boolean
  push_to_images:
  type: string
- version_prerelease:
- type: string
- version_metadata:
+ version_suffix:
  type: string
  flavor:
  type: string
@@ -85,9 +83,7 @@ jobs:
  - uses: docker/build-push-action@v4
  with:
  context: .
- build-args: |
- MASTODON_VERSION_PRERELEASE=${{ inputs.version_prerelease }}
- MASTODON_VERSION_METADATA=${{ inputs.version_metadata }}
+ build-args: MASTODON_VERSION_SUFFIX=${{ inputs.version_suffix }}
  platforms: ${{ inputs.platforms }}
  provenance: false
  builder: ${{ steps.buildx.outputs.name || steps.buildx-native.outputs.name }}

.github/workflows/build-nightly.yml

@@ -16,9 +16,9 @@ jobs:
  env:
  TZ: Etc/UTC
  run: |
- echo mastodon_version_prerelease=nightly.$(date +'%Y-%m-%d')>> $GITHUB_OUTPUT
+ echo mastodon_version_suffix=nightly-$(date +'%Y-%m-%d')>> $GITHUB_OUTPUT
  outputs:
- prerelease: ${{ steps.version_vars.outputs.mastodon_version_prerelease }}
+ suffix: ${{ steps.version_vars.outputs.mastodon_version_suffix }}
 
  build-image:
  needs: compute-suffix
@@ -29,13 +29,14 @@ jobs:
  push_to_images: |
  tootsuite/mastodon
  ghcr.io/mastodon/mastodon
- version_prerelease: ${{ needs.compute-suffix.outputs.prerelease }}
+ # The `+` is important here, result will be v4.1.2+nightly-2022-03-05
+ version_suffix: +${{ needs.compute-suffix.outputs.suffix }}
  labels: |
  org.opencontainers.image.description=Nightly build image used for testing purposes
  flavor: |
  latest=auto
  tags: |
  type=raw,value=edge
  type=raw,value=nightly
- type=schedule,pattern=${{ needs.compute-suffix.outputs.prerelease }}
+ type=schedule,pattern=${{ needs.compute-suffix.outputs.suffix }}
  secrets: inherit

.github/workflows/build-push-pr.yml

@@ -21,9 +21,9 @@ jobs:
  uses: actions/checkout@v3
  - id: version_vars
  run: |
- echo mastodon_version_metadata=pr-${{ github.event.pull_request.number }}-$(git rev-parse --short HEAD) >> $GITHUB_OUTPUT
+ echo mastodon_version_suffix=+pr-${{ github.event.pull_request.number }}-$(git rev-parse --short HEAD) >> $GITHUB_OUTPUT
  outputs:
- metadata: ${{ steps.version_vars.outputs.mastodon_version_metadata }}
+ suffix: ${{ steps.version_vars.outputs.mastodon_version_suffix }}
 
  build-image:
  needs: compute-suffix
@@ -33,7 +33,7 @@ jobs:
  use_native_arm64_builder: true
  push_to_images: |
  ghcr.io/mastodon/mastodon
- version_metadata: ${{ needs.compute-suffix.outputs.metadata }}
+ version_suffix: ${{ needs.compute-suffix.outputs.suffix }}
  flavor: |
  latest=auto
  tags: |

.github/workflows/test-ruby.yml

@@ -153,100 +153,3 @@ jobs:
  run: './bin/rails db:create db:schema:load db:seed'
 
  - run: bundle exec rake rspec_chunked
-
- test-e2e:
- name: End to End testing
- runs-on: ubuntu-latest
-
- needs:
- - build
-
- services:
- postgres:
- image: postgres:14-alpine
- env:
- POSTGRES_PASSWORD: postgres
- POSTGRES_USER: postgres
- options: >-
- --health-cmd pg_isready
- --health-interval 10s
- --health-timeout 5s
- --health-retries 5
- ports:
- - 5432:5432
-
- redis:
- image: redis:7-alpine
- options: >-
- --health-cmd "redis-cli ping"
- --health-interval 10s
- --health-timeout 5s
- --health-retries 5
- ports:
- - 6379:6379
-
- env:
- DB_HOST: localhost
- DB_USER: postgres
- DB_PASS: postgres
- DISABLE_SIMPLECOV: true
- RAILS_ENV: test
- BUNDLE_WITH: test
-
- strategy:
- fail-fast: false
- matrix:
- ruby-version:
- - '3.0'
- - '3.1'
- - '.ruby-version'
-
- steps:
- - uses: actions/checkout@v3
-
- - uses: actions/download-artifact@v3
- with:
- path: './public'
- name: ${{ github.sha }}
-
- - name: Update package index
- run: sudo apt-get update
-
- - name: Set up Node.js
- uses: actions/setup-node@v3
- with:
- cache: yarn
- node-version-file: '.nvmrc'
-
- - name: Install native Ruby dependencies
- run: sudo apt-get install -y libicu-dev libidn11-dev
-
- - name: Install additional system dependencies
- run: sudo apt-get install -y ffmpeg imagemagick
-
- - name: Set up bundler cache
- uses: ruby/setup-ruby@v1
- with:
- ruby-version: ${{ matrix.ruby-version}}
- bundler-cache: true
-
- - run: yarn --frozen-lockfile
-
- - name: Load database schema
- run: './bin/rails db:create db:schema:load db:seed'
-
- - run: bundle exec rake spec:system
-
- - name: Archive logs
- uses: actions/upload-artifact@v3
- if: failure()
- with:
- name: e2e-logs-${{ matrix.ruby-version }}
- path: log/
-
- - name: Archive test screenshots
- uses: actions/upload-artifact@v3
- if: failure()
- with:
- name: e2e-screenshots
- path: tmp/screenshots/

.rubocop.yml

@@ -38,7 +38,14 @@ Layout/FirstHashElementIndentation:
 # Reason: Currently disabled in .rubocop_todo.yml
 # https://docs.rubocop.org/rubocop/cops_layout.html#layoutlinelength
 Layout/LineLength:
- Max: 320 # Default of 120 causes a duplicate entry in generated todo file
+ AllowedPatterns:
+ # Allow comments to be long lines
+ - !ruby/regexp / \# .*$/
+ - !ruby/regexp /^\# .*$/
+ Exclude:
+ - 'lib/mastodon/cli/*.rb'
+ - db/*migrate/**/*
+ - db/seeds/**/*
 
 # Reason:
 # https://docs.rubocop.org/rubocop/cops_lint.html#lintuselessaccessmodifier