Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev to main #226

Merged
merged 30 commits into from
Apr 5, 2023
Merged

Dev to main #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
09f15ed
UHF-7883: Updated hdbt subtheme based on platform config changes.
khalima Feb 9, 2023
346500c
UHF-7883: Updated hdbt_subtheme tools.
khalima Feb 13, 2023
7444ca0
UHF-7883: Fixed references to old hdbt_content module.
khalima Feb 21, 2023
cee025c
UHF-7883: Fixed references to old hdbt_admin_editorial module.
khalima Feb 21, 2023
9c898d2
UHF-7883: Merge branch 'dev' into UHF-7883_platform_config_v3
khalima Feb 22, 2023
9599220
UHF-7883: Merge branch 'dev' into UHF-7883_platform_config_v3
khalima Feb 24, 2023
e401c06
UHF-8182: Merge branch 'UHF-7883_platform_config_v3' of github.com:Ci…
khalima Mar 24, 2023
a96357c
UHF-6859: Updated workflow files
tuutti Mar 25, 2023
af41266
UHF-6859: UHF-8275: Scan security updates
tuutti Mar 26, 2023
b2df974
Update configuration
actions-bot Mar 27, 2023
a53e314
Merge pull request #225 from City-of-Helsinki/update-configuration
khalima Mar 27, 2023
016294d
Merge pull request #224 from City-of-Helsinki/UHF-6859
Jussiles Mar 27, 2023
fe9000e
UHF-6969: Removed lightweight cron key
tuutti Mar 28, 2023
5fba196
UHF-8101: Update hds-react package to fix normalize style issues with…
Jussiles Mar 28, 2023
ce075a7
Merge pull request #228 from City-of-Helsinki/UHF-6969
tuutti Mar 29, 2023
42d3743
UHF-8182: Moved helfi rekry content languages underneath the config/i…
khalima Mar 29, 2023
bbd5361
Merge pull request #229 from City-of-Helsinki/UHF-8101-update-hds-wit…
Jussiles Mar 29, 2023
371f228
UHF-8182: Updated configurations via platform v3.
khalima Mar 29, 2023
533f358
UHF-8182: Remvoved obsolete configuration.
khalima Mar 31, 2023
a5c54b7
UHF-8182: Removed obsolete translation.
khalima Mar 31, 2023
d4b7f26
Merge pull request #230 from City-of-Helsinki/UHF-8182
khalima Apr 3, 2023
935b1fa
UHF-8077: Run database updates before tests
tuutti Apr 3, 2023
012d3b1
Update configuration
actions-bot Apr 3, 2023
013bc8f
Merge pull request #231 from City-of-Helsinki/UHF-8077
tuutti Apr 3, 2023
af77603
Merge pull request #227 from City-of-Helsinki/update-configuration
khalima Apr 3, 2023
573295f
Update configuration
actions-bot Apr 4, 2023
e5e62da
Merge pull request #232 from City-of-Helsinki/update-configuration
khalima Apr 4, 2023
c1a15ec
Update configuration
actions-bot Apr 4, 2023
e072603
Update filter.format.plain_text.yml
khalima Apr 4, 2023
ebaeb85
Merge pull request #233 from City-of-Helsinki/update-configuration
khalima Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/artifact.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

services:
db:
image: mariadb:10.7
image: mariadb
env:
MYSQL_USER: drupal
MYSQL_PASSWORD: drupal
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
on: [push]
on:
pull_request:
push:
branches: ['main', 'dev']
name: CI
env:
SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal"
Expand All @@ -13,7 +16,7 @@ jobs:

services:
db:
image: mariadb:10.9
image: mariadb
env:
MYSQL_USER: drupal
MYSQL_PASSWORD: drupal
Expand All @@ -30,6 +33,9 @@ jobs:
- name: Build project
run: composer install

- name: Scan security updates
run: drush pm:security

- name: Check that subtheme is not built with dev mode
run: if grep -q 'sourceMappingURL=' -R public/themes/custom/hdbt_subtheme/dist/css; then exit 1; fi

Expand All @@ -46,7 +52,7 @@ jobs:
- name: Install Drupal
run: |
mysql --user=drupal --password=drupal --database=drupal --host=db --port=3306 -A < latest.sql
drush cr && drush cim -y
drush deploy
- name: Start services
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

services:
db:
image: mariadb:10.7
image: mariadb
env:
MYSQL_USER: drupal
MYSQL_PASSWORD: drupal
Expand All @@ -39,7 +39,7 @@ jobs:
run: |
composer install
$(drush sql:connect) < latest.sql
drush cr && drush cim -y
drush deploy
composer update drupal/helfi_* drupal/hdbt* -W
drush cr && drush updb -y && drush cex -y
# Update platform
Expand Down
11 changes: 6 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,25 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"composer/installers": "^1.9",
"composer/installers": "^2.0",
"cweagans/composer-patches": "^1.6.7",
"drupal/core": "^9.4",
"drupal/core-composer-scaffold": "^9.4",
"drupal/disable_field": "^3.0",
"drupal/hdbt": "^4.0",
"drupal/hdbt_admin": "^1.0",
"drupal/hdbt": "^5.0",
"drupal/hdbt_admin": "^2.0",
"drupal/helfi_azure_fs": "^1.1",
"drupal/helfi_drupal_tools": "dev-main",
"drupal/helfi_navigation": "^2.0",
"drupal/helfi_platform_config": "^2.0",
"drupal/helfi_platform_config": "^3.0",
"drupal/helfi_proxy": "^3.0",
"drupal/helfi_tpr": "^2.0",
"drupal/helfi_tunnistamo": "^2.0",
"drupal/migrate_plus": "^6.0",
"drupal/raven": "^4.0",
"drupal/redis": "^1.5",
"drupal/stage_file_proxy": "^1.2",
"drush/drush": "^10.4 || ^11"
"drush/drush": "^11"
},
"require-dev": {
"donatj/mock-webserver": "^2.4",
Expand Down
Loading