Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency.
This commit is contained in:
		
							
								
								
									
										17
									
								
								.github/workflows/check-i18n.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										17
									
								
								.github/workflows/check-i18n.yml
									
									
									
									
										vendored
									
									
								
							@@ -30,13 +30,28 @@ jobs:
 | 
			
		||||
          ruby-version: .ruby-version
 | 
			
		||||
          bundler-cache: true
 | 
			
		||||
 | 
			
		||||
      - name: Set up Node.js
 | 
			
		||||
        uses: actions/setup-node@v3
 | 
			
		||||
        with:
 | 
			
		||||
          cache: yarn
 | 
			
		||||
          node-version-file: '.nvmrc'
 | 
			
		||||
 | 
			
		||||
      - name: Install all yarn packages
 | 
			
		||||
        run: yarn --frozen-lockfile
 | 
			
		||||
 | 
			
		||||
      - name: Check for missing strings in English JSON
 | 
			
		||||
        run: |
 | 
			
		||||
          yarn build:development
 | 
			
		||||
          yarn manage:translations
 | 
			
		||||
          git diff --exit-code
 | 
			
		||||
 | 
			
		||||
      - name: Check locale file normalization
 | 
			
		||||
        run: bundle exec i18n-tasks check-normalized
 | 
			
		||||
 | 
			
		||||
      - name: Check for unused strings
 | 
			
		||||
        run: bundle exec i18n-tasks unused
 | 
			
		||||
 | 
			
		||||
      - name: Check for missing strings in English
 | 
			
		||||
      - name: Check for missing strings in English YML
 | 
			
		||||
        run: |
 | 
			
		||||
          bundle exec i18n-tasks add-missing -l en
 | 
			
		||||
          git diff --exit-code
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										9
									
								
								.github/workflows/lint-js.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										9
									
								
								.github/workflows/lint-js.yml
									
									
									
									
										vendored
									
									
								
							@@ -6,22 +6,28 @@ on:
 | 
			
		||||
    paths:
 | 
			
		||||
      - 'package.json'
 | 
			
		||||
      - 'yarn.lock'
 | 
			
		||||
      - 'tsconfig.json'
 | 
			
		||||
      - '.nvmrc'
 | 
			
		||||
      - '.prettier*'
 | 
			
		||||
      - '.eslint*'
 | 
			
		||||
      - '**/*.js'
 | 
			
		||||
      - '**/*.jsx'
 | 
			
		||||
      - '**/*.ts'
 | 
			
		||||
      - '**/*.tsx'
 | 
			
		||||
      - '.github/workflows/lint-js.yml'
 | 
			
		||||
 | 
			
		||||
  pull_request:
 | 
			
		||||
    paths:
 | 
			
		||||
      - 'package.json'
 | 
			
		||||
      - 'yarn.lock'
 | 
			
		||||
      - 'tsconfig.json'
 | 
			
		||||
      - '.nvmrc'
 | 
			
		||||
      - '.prettier*'
 | 
			
		||||
      - '.eslint*'
 | 
			
		||||
      - '**/*.js'
 | 
			
		||||
      - '**/*.jsx'
 | 
			
		||||
      - '**/*.ts'
 | 
			
		||||
      - '**/*.tsx'
 | 
			
		||||
      - '.github/workflows/lint-js.yml'
 | 
			
		||||
 | 
			
		||||
jobs:
 | 
			
		||||
@@ -43,3 +49,6 @@ jobs:
 | 
			
		||||
 | 
			
		||||
      - name: ESLint
 | 
			
		||||
        run: yarn test:lint:js
 | 
			
		||||
 | 
			
		||||
      - name: Typecheck
 | 
			
		||||
        run: yarn test:typecheck
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user