Skip to content

Commit

Permalink
Merge branch '3' into 4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
GuySartorelli committed Apr 27, 2023
2 parents 19b69b7 + 063db42 commit be67a99
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 8 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,8 @@ on:
push:
pull_request:
workflow_dispatch:
# Every Sunday at 4:10pm UTC
schedule:
- cron: '10 16 * * 0'

jobs:
ci:
name: CI
# Only run cron on the bringyourownideas account
if: (github.event_name == 'schedule' && github.repository_owner == 'bringyourownideas') || (github.event_name != 'schedule')
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
16 changes: 16 additions & 0 deletions .github/workflows/dispatch-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Dispatch CI

on:
# At 4:10 PM UTC, only on Sunday and Monday
schedule:
- cron: '10 16 * * 0,1'

jobs:
dispatch-ci:
name: Dispatch CI
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
steps:
- name: Dispatch CI
uses: silverstripe/gha-dispatch-ci@v1
9 changes: 9 additions & 0 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[main]
host = https://www.transifex.com

[o:silverstripe:p:silverstripe-composer-update-checker:r:master]
file_filter = lang/<lang>.yml
source_file = lang/en.yml
source_lang = en
type = YML

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@
"issues": "https://github.com/bringyourownideas/silverstripe-composer-update-checker/issues"
},
"homepage": "https://github.com/bringyourownideas/silverstripe-composer-update-checker"
}
}
Empty file added lang/_manifest_exclude
Empty file.
4 changes: 4 additions & 0 deletions lang/en.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
en:
BringYourOwnIdeas\Maintenance\Model\Package:
db_AvailableVersion: Available
db_LatestVersion: Latest
4 changes: 2 additions & 2 deletions src/Extensions/ComposerUpdateExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ class ComposerUpdateExtension extends DataExtension
];

private static $summary_fields = [
'AvailableVersion' => 'Available',
'LatestVersion' => 'Latest',
'AvailableVersion',
'LatestVersion'
];

/**
Expand Down

0 comments on commit be67a99

Please sign in to comment.