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.

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

Sync staging with deploy #761

Merged
merged 19 commits into from
Dec 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,15 @@ on:

jobs:
build:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: Firenza/[email protected]
with:
secrets: ${{ toJSON(secrets) }}
- name: Specify PHP version
uses: shivammathur/setup-php@v2
with:
php-version: '5.6'
- name: Make branch name available as Bash variable
run: echo "GITHUB_BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
- run: >-
Expand Down Expand Up @@ -52,7 +56,7 @@ jobs:
github_branch: ${{ steps.get_branch.outputs.github_branch }}

deploy:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
needs: build # Don't deploy unless the build succeeds
steps:
- run: echo "Deploy branch is ${{ needs.build.outputs.github_branch }}"
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"require": {
"phpmailer/phpmailer": "~6.5",
"ezyang/htmlpurifier":"~4.9",
"doctrine/instantiator":"1.4.0",
"doctrine/instantiator":"1",
"simplepie/simplepie": "1.5.5",
"romainneutron/sphinx-search-api-php-client": "2.0.8.1",
"tijsverkoyen/akismet": "~1",
Expand Down
Loading
Loading