Skip to content

Commit

Permalink
change CI branch back to master
Browse files Browse the repository at this point in the history
  • Loading branch information
@emmachughes
emmachughes committed Nov 27, 2024
1 parent a1e280a commit 29ab0d0
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/contentauthor.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ name: Content Author
on:
push:
branches:
- edlib3
- master
paths:
- '.github/workflows/contentauthor.yaml'
- 'sourcecode/apis/contentauthor/**'
tags:
- 'v*'
pull_request:
branches:
- edlib3
- master
paths:
- '.github/workflows/contentauthor.yaml'
- 'sourcecode/apis/contentauthor/**'
Expand All @@ -37,7 +37,7 @@ jobs:
run: composer validate

php-cs-fixer:
if: github.ref != 'refs/heads/edlib3'
if: github.ref != 'refs/heads/master'
needs: [composer-validate]
runs-on: ubuntu-22.04

Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
vendor/bin/phpunit --coverage-clover /reports/coverage.xml
- name: Upload coverage to Codecov
if: github.event_name == 'push' && github.ref != 'refs/heads/edlib3'
if: github.event_name == 'push' && github.ref != 'refs/heads/master'
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
Expand All @@ -180,7 +180,7 @@ jobs:
images: |
name=ghcr.io/cerpus/edlib-contentauthor
tags: |
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/edlib3' }},prefix=php-
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }},prefix=php-
type=semver,pattern={{version}},prefix=php-
type=semver,pattern={{major}}.{{minor}},prefix=php-
type=semver,pattern={{major}},prefix=php-
Expand All @@ -194,7 +194,7 @@ jobs:
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
context: sourcecode/apis/contentauthor
push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/edlib3' }}
push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
target: prod
tags: ${{ steps.php_meta.outputs.tags }}

Expand All @@ -205,7 +205,7 @@ jobs:
images: |
name=ghcr.io/cerpus/edlib-contentauthor
tags: |
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/edlib3' }},prefix=web-
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }},prefix=web-
type=semver,pattern={{version}},prefix=web-
type=semver,pattern={{major}}.{{minor}},prefix=web-
type=semver,pattern={{major}},prefix=web-
Expand All @@ -219,7 +219,7 @@ jobs:
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
context: sourcecode/apis/contentauthor
push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/edlib3' }}
push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
target: web
tags: ${{ steps.web_meta.outputs.tags }}

Expand All @@ -230,7 +230,7 @@ jobs:
deploy-eb:
name: Deploy CA to test environments
if: always() && needs.build_test_publish.result == 'success' && github.event_name == 'push' && github.ref == 'refs/heads/edlib3'
if: always() && needs.build_test_publish.result == 'success' && github.event_name == 'push' && github.ref == 'refs/heads/master'
needs: [build_test_publish]
strategy:
matrix:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/hub.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ name: Hub
on:
push:
branches:
- edlib3
- master
paths:
- ".github/workflows/hub.yaml"
- "sourcecode/hub/**"
tags:
- 'v*'
pull_request:
branches:
- edlib3
- master
paths:
- '.github/workflows/hub.yaml'
- 'sourcecode/hub/**'
Expand All @@ -37,7 +37,7 @@ jobs:
run: composer validate --no-check-publish

php-cs-fixer:
if: github.ref != 'refs/heads/edlib3'
if: github.ref != 'refs/heads/master'
needs: [composer-validate]
runs-on: ubuntu-22.04

Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
images: |
name=ghcr.io/cerpus/edlib-hub
tags: |
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/edlib3' }},prefix=php-
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }},prefix=php-
type=semver,pattern={{version}},prefix=php-
type=semver,pattern={{major}}.{{minor}},prefix=php-
type=semver,pattern={{major}},prefix=php-
Expand All @@ -215,7 +215,7 @@ jobs:
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/buildx-cache-new,mode=max
context: sourcecode/hub
push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/edlib3' }}
push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
target: prod
tags: ${{ steps.php_meta.outputs.tags }}

Expand All @@ -226,7 +226,7 @@ jobs:
images: |
name=ghcr.io/cerpus/edlib-hub
tags: |
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/edlib3' }},prefix=web-
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }},prefix=web-
type=semver,pattern={{version}},prefix=web-
type=semver,pattern={{major}}.{{minor}},prefix=web-
type=semver,pattern={{major}},prefix=web-
Expand All @@ -240,7 +240,7 @@ jobs:
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
context: sourcecode/hub
push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/edlib3' }}
push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
target: web
tags: ${{ steps.web_meta.outputs.tags }}

Expand All @@ -251,7 +251,7 @@ jobs:
deploy-eb:
name: Deploy hub to test environments
if: always() && needs.build_test_publish.result == 'success' && github.event_name == 'push' && github.ref == 'refs/heads/edlib3'
if: always() && needs.build_test_publish.result == 'success' && github.event_name == 'push' && github.ref == 'refs/heads/master'
needs: [build_test_publish]
strategy:
matrix:
Expand Down

0 comments on commit 29ab0d0

Please sign in to comment.