Skip to content

Commit

Permalink
Merge branch 'fk-stnfd-sprint-47' of github.com:SU-HSDO/suhumsci into…
Browse files Browse the repository at this point in the history
… shs-5567
  • Loading branch information
cienvaras committed Apr 3, 2024
2 parents 41b19a2 + afe097f commit bea2160
Show file tree
Hide file tree
Showing 21 changed files with 450 additions and 479 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
*.xml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.yml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2

# PHPStan's baseline uses tabs instead of spaces.
core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tabwidth=2 diff=php linguist-language=php

# Define binary file attributes.
# - Do not treat them as text.
# - Include binary diff in patches instead of "binary files differ."
Expand Down
34 changes: 0 additions & 34 deletions .github/workflows/label.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,5 @@ jobs:
title: ${{ steps.next_tag.outputs.version }}
body: "# DO NOT DELETE"
- name: Push New Branch
if: ${{ steps.tag.outputs.tag }}
run: blt deploy -n
if: ${{ steps.next_tag.outputs.version }}
run: blt deploy --branch=${{ steps.next_tag.outputs.version }}-release-build --commit-msg=${{ steps.next_tag.outputs.version }} --ignore-dirty -n
12 changes: 12 additions & 0 deletions .github/workflows/sites-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,12 @@ jobs:
apachectl stop
apachectl start
blt codeception --group=existingSite
- name: Save Test Results
uses: actions/upload-artifact@v4
if: always()
with:
name: codeception--${{ matrix.site }}
path: /var/www/html/artifacts
test_new_site:
runs-on: ubuntu-latest
container:
Expand Down Expand Up @@ -207,6 +213,12 @@ jobs:
apachectl stop
apachectl start
blt codeception --group=install
- name: Save Test Results
uses: actions/upload-artifact@v4
if: always()
with:
name: codeception--new-site
path: /var/www/html/artifacts
deploy_branch:
needs:
- test_phpunit
Expand Down
Loading

0 comments on commit bea2160

Please sign in to comment.