Skip to content

Commit

Permalink
Merge pull request #780 from nextcloud-libraries/chore/update-workflows
Browse files Browse the repository at this point in the history
chore: Update workflows
  • Loading branch information
susnux authored Jan 9, 2024
2 parents d1fa2be + 72a5dfa commit 22c66bb
Show file tree
Hide file tree
Showing 14 changed files with 16,759 additions and 6,546 deletions.
60 changes: 9 additions & 51 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,54 +8,12 @@ updates:
time: "03:00"
timezone: Europe/Paris
open-pull-requests-limit: 10
ignore:
- dependency-name: jsdom
versions:
- 16.5.1
- 16.5.3
- dependency-name: core-js
versions:
- 3.10.1
- 3.9.0
- 3.9.1
- dependency-name: "@babel/core"
versions:
- 7.12.17
- 7.13.10
- 7.13.13
- 7.13.14
- 7.13.15
- 7.13.8
- dependency-name: typedoc
versions:
- 0.20.16
- 0.20.19
- 0.20.21
- 0.20.24
- 0.20.25
- 0.20.28
- 0.20.29
- 0.20.30
- 0.20.32
- 0.20.34
- 0.20.35
- dependency-name: "@babel/cli"
versions:
- 7.12.17
- 7.13.0
- 7.13.10
- dependency-name: "@babel/preset-env"
versions:
- 7.12.17
- 7.13.10
- 7.13.8
- 7.13.9
- dependency-name: chai
versions:
- 4.3.3
- dependency-name: "@nextcloud/browserslist-config"
versions:
- 2.0.0
- dependency-name: "@babel/preset-typescript"
versions:
- 7.12.17
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
timezone: Europe/Paris
open-pull-requests-limit: 10
labels:
- 3. to review
- dependencies
40 changes: 40 additions & 0 deletions .github/workflows/dependabot-approve-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# This workflow is provided via the organization template repository
#
# https://github.com/nextcloud/.github
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization

name: Dependabot

on:
pull_request_target:
branches:
- main
- master
- stable*

permissions:
contents: read

concurrency:
group: dependabot-approve-merge-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
auto-approve-merge:
if: github.actor == 'dependabot[bot]'
runs-on: ubuntu-latest
permissions:
# for hmarr/auto-approve-action to approve PRs
pull-requests: write

steps:
# Github actions bot approve
- uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

# Nextcloud bot approve and merge request
- uses: ahmadnassri/action-dependabot-auto-merge@45fc124d949b19b6b8bf6645b6c9d55f4f9ac61a # v2
with:
target: minor
github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}
11 changes: 0 additions & 11 deletions .github/workflows/dependabot-approve.yml

This file was deleted.

30 changes: 24 additions & 6 deletions .github/workflows/l10n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,32 @@ jobs:
runs-on: ubuntu-latest
name: Pot check
steps:
- uses: actions/checkout@master
- name: Set up Node
uses: actions/setup-node@v1
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Read package.json node and npm engines version
uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.2
id: versions
with:
fallbackNode: '^20'
fallbackNpm: '^9'

- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v3
with:
node-version: 12.x
- name: npm install
node-version: ${{ steps.versions.outputs.nodeVersion }}

- name: Set up npm ${{ steps.versions.outputs.npmVersion }}
run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"

- name: Install dependencies
env:
CYPRESS_INSTALL_BINARY: 0
PUPPETEER_SKIP_DOWNLOAD: true
run: npm ci
- name: extract l10n files

- name: Extract l10n files
run: npm run l10n:extract

- name: Check l10n file changes
run: bash -c "[[ ! \"`git status --porcelain l10n`\" ]] || ( echo 'Uncommited l10n changes. Run `npm l10n:extract`.' && git status && exit 1 )"
95 changes: 95 additions & 0 deletions .github/workflows/lint-eslint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
# This workflow is provided via the organization template repository
#
# https://github.com/nextcloud/.github
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
#
# Use lint-eslint together with lint-eslint-when-unrelated to make eslint a required check for GitHub actions
# https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks

name: Lint eslint

on: pull_request

permissions:
contents: read

concurrency:
group: lint-eslint-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
changes:
runs-on: ubuntu-latest

outputs:
src: ${{ steps.changes.outputs.src}}

steps:
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
id: changes
continue-on-error: true
with:
filters: |
src:
- '.github/workflows/**'
- 'src/**'
- 'appinfo/info.xml'
- 'package.json'
- 'package-lock.json'
- 'tsconfig.json'
- '.eslintrc.*'
- '.eslintignore'
- '**.js'
- '**.ts'
- '**.vue'
lint:
runs-on: ubuntu-latest

needs: changes
if: needs.changes.outputs.src != 'false'

name: NPM lint

steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Read package.json node and npm engines version
uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.2
id: versions
with:
fallbackNode: '^20'
fallbackNpm: '^9'

- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v3
with:
node-version: ${{ steps.versions.outputs.nodeVersion }}

- name: Set up npm ${{ steps.versions.outputs.npmVersion }}
run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"

- name: Install dependencies
env:
CYPRESS_INSTALL_BINARY: 0
PUPPETEER_SKIP_DOWNLOAD: true
run: npm ci

- name: Lint
run: npm run lint

summary:
permissions:
contents: none
runs-on: ubuntu-latest
needs: [changes, lint]

if: always()

# This is the summary, we just avoid to rename it so that branch protection rules still match
name: eslint

steps:
- name: Summary status
run: if ${{ needs.changes.outputs.src != 'false' && needs.lint.result != 'success' }}; then exit 1; fi
17 changes: 0 additions & 17 deletions .github/workflows/lint.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ typings/
# next.js build output
.next

/dist
dist/
26 changes: 13 additions & 13 deletions build/extract-l10n.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
const { GettextExtractor, JsExtractors } = require('gettext-extractor');
const { GettextExtractor, JsExtractors } = require('gettext-extractor')

let extractor = new GettextExtractor();
const extractor = new GettextExtractor()

extractor
.createJsParser([
JsExtractors.callExpression('gt.gettext', {
arguments: {
text: 0,
context: 1
}
}),
])
.parseFilesGlob('./lib/**/*.@(ts|js)');
.createJsParser([
JsExtractors.callExpression('gt.gettext', {
arguments: {
text: 0,
context: 1,
},
}),
])
.parseFilesGlob('./lib/**/*.@(ts|js)')

extractor.savePotFile('./l10n/messages.pot');
extractor.savePotFile('./l10n/messages.pot')

extractor.printStats();
extractor.printStats()
2 changes: 1 addition & 1 deletion l10n/messages.pot
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"

#: lib/index.ts:20
#: lib/index.ts:22
msgid "seconds"
msgstr ""
6 changes: 3 additions & 3 deletions lib/constants.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
interface Translations {
locale: string
json: object
locale: string
json: object
}

declare const LOCALES: Translations[];
declare const LOCALES: Translations[]
16 changes: 9 additions & 7 deletions lib/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,23 @@ import { getLocale } from '@nextcloud/l10n'
const gt = new Gettext()

const locale = getLocale()
LOCALES.map(data => {
gt.addTranslations(data.locale, 'messages', data.json)
LOCALES.forEach((data) => {
gt.addTranslations(data.locale, 'messages', data.json)
})
gt.setLocale(locale)
// eslint-disable-next-line import/no-named-as-default-member
moment.locale(locale)

// Only update the locale of moment.js if it's available. Moment.js ships more locales than we
// track in transifex, so we prefer the included translation. Always prefer our default english
// translation.
if (locale === 'en' || LOCALES.find(data => data.locale === locale)) {
moment.updateLocale(moment.locale(), {
relativeTime: {
s: gt.gettext('seconds'),
},
})
// eslint-disable-next-line import/no-named-as-default-member
moment.updateLocale(moment.locale(), {
relativeTime: {
s: gt.gettext('seconds'),
},
})
}

export default moment
Loading

0 comments on commit 22c66bb

Please sign in to comment.