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 #302

Merged
merged 12 commits into from
Aug 30, 2023
Merged

Dev to main #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cfc6cc1
Update configuration
actions-bot Aug 14, 2023
2e6b35c
UHF-8829: Run composer with --no-interaction flag
tuutti Aug 17, 2023
401599b
Merge pull request #301 from City-of-Helsinki/UHF-8829
hyrsky Aug 17, 2023
9074f2e
Merge pull request #300 from City-of-Helsinki/update-configuration
Jussiles Aug 18, 2023
77cdce0
UHF-8845: add sitemap urls in en instead of fi.
Jussiles Aug 18, 2023
86fb36a
UHF-8802: Non-linguistic URLs
tuutti Aug 22, 2023
ccc4d86
Merge pull request #304 from City-of-Helsinki/UHF-8802
tuutti Aug 23, 2023
f409476
Merge pull request #303 from City-of-Helsinki/UHF-8845-fix-custom-sit…
jeremysteerio Aug 24, 2023
20aec7d
Update configuration
actions-bot Aug 29, 2023
d1679a1
Merge pull request #305 from City-of-Helsinki/update-configuration
rpnykanen Aug 30, 2023
18a439e
Update configuration
actions-bot Aug 30, 2023
64557b5
Merge pull request #306 from City-of-Helsinki/update-configuration
xkhaven Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions .github/workflows/artifact.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,11 @@ on:
schedule:
- cron: '0 0 * * 0'
name: Build artifacts
env:
DRUPAL_BUILD_FROM_SCRATCH: true
SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal"
SIMPLETEST_BASE_URL: "http://127.0.0.1:8080"
XDEBUG_MODE: off
jobs:
build:
runs-on: ubuntu-latest
container:
image: ghcr.io/city-of-helsinki/drupal-php-docker:8.1-alpine
image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine

services:
db:
Expand All @@ -33,7 +28,7 @@ jobs:
fetch-depth: 1

- name: Build project
run: composer install
run: composer install --no-interaction

- name: Setup drupal and save database dump
run: |
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@ on:
branches: ['main', 'dev']
name: CI
env:
SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal"
SIMPLETEST_BASE_URL: "http://127.0.0.1:8080"
SYMFONY_DEPRECATIONS_HELPER: disabled
XDEBUG_MODE: off
jobs:
tests:
runs-on: ubuntu-latest
container:
image: ghcr.io/city-of-helsinki/drupal-php-docker:8.1-alpine
image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine

services:
db:
Expand All @@ -31,7 +28,7 @@ jobs:
fetch-depth: 1

- name: Build project
run: composer install
run: composer install --no-interaction

- name: Scan security updates
run: drush pm:security
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/update-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,11 @@ on:
repository_dispatch:
types: [config_change]
name: Update config
env:
SIMPLETEST_BASE_URL: "http://127.0.0.1:8080"
SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal"
XDEBUG_MODE: off
jobs:
update-config:
runs-on: ubuntu-latest
container:
image: ghcr.io/city-of-helsinki/drupal-php-docker:8.1-alpine
image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine

services:
db:
Expand All @@ -37,10 +33,10 @@ jobs:

- name: Build project
run: |
composer install
composer install --no-interaction
$(drush sql:connect) < latest.sql
drush cim -y && drush updb -y && drush cr
composer update drupal/helfi_* drupal/hdbt* -W
composer update drupal/helfi_* drupal/hdbt* -W --no-interaction
drush cr && drush updb -y && drush cex -y
# Update platform
drush helfi:tools:update-platform
Expand Down
Loading
Loading