Skip to content

Commit

Permalink
UHF-10276: Merge branch 'develop' of github.com:City-of-Helsinki/hel-…
Browse files Browse the repository at this point in the history
…fi-drupal-grants into UHF-10276
  • Loading branch information
teroelonen committed Oct 22, 2024
2 parents 9aa7fb0 + a5f741a commit 7e31b76
Show file tree
Hide file tree
Showing 100 changed files with 3,409 additions and 1,353 deletions.
57 changes: 0 additions & 57 deletions .github/workflows/sonarcloud.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
#- name: Make sure configuration was exported in correct language (en or und)
# run: |
# OUTPUT=$(grep -oP '^langcode: \b(?!(?:en|und)\b)\w+' conf -R || true)
#

# if [ ! -z "$OUTPUT" ]; then
# echo "Found configuration that does not match the pattern 'langcode: (en|und)':" >> $GITHUB_STEP_SUMMARY
# echo "$OUTPUT" >> $GITHUB_STEP_SUMMARY
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/update-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Check if required secrets are set
env:
AUTOMATIC_UPDATE_TOKEN: ${{ secrets.AUTOMATIC_UPDATE_TOKEN }}
if: env.AUTOMATIC_UPDATE_TOKEN == ''
run: exit 1

- name: Download latest dump
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -77,6 +83,7 @@ jobs:
uses: peter-evans/create-pull-request@v6
with:
commit-message: Update configuration
token: ${{ secrets.AUTOMATIC_UPDATE_TOKEN }}
title: Automatic update
labels: auto-update
body: |
Expand Down
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,11 @@ public/sites/default/local.services.yml
!*.gitkeep
!*.keepme
.phpunit.*

# Ignore the private env files for HTTP requests
/tools/http/http-client.private.env.json


## testing results
*coverage.xml
html-coverage
1 change: 1 addition & 0 deletions .platform/ignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.github/pull_request_template.md
phpunit.xml.dist
.gitignore
103 changes: 53 additions & 50 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7e31b76

Please sign in to comment.