Skip to content

Commit

Permalink
Prepare 2.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
PierreGauthier committed Aug 29, 2024
1 parent 79f7926 commit 2bd7c32
Show file tree
Hide file tree
Showing 6 changed files with 214 additions and 619 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
name: Tests
uses: ./.github/workflows/tests.yml
with:
version: 1.3.x
last_published_version: 1.3.1
version: 2.0.x
last_published_version: 2.0.x-dev
use_default_github_ref: true
secrets: inherit
41 changes: 41 additions & 0 deletions .github/workflows/deploy-2.0.x.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Deploy 1.3.x

on:
workflow_dispatch:
inputs:
skip_tests:
description: 'Skip tests before delivery ?'
type: boolean
default: false
required: false

jobs:
tests:
name: Tests
if: ${{ inputs.skip_tests == false }}
uses: ./.github/workflows/tests.yml
with:
version: 2.0.x
last_published_version: 2.0.x-dev
secrets:
COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
PACKAGIST_URL: ${{ secrets.PACKAGIST_URL }}

deploy-2_0_x:
needs: tests
name: Deploy 2.0x
if: |
always() &&
(needs.tests.result == 'success' || needs.tests.result == 'skipped')
uses: ./.github/workflows/deploy-int.yml
with:
version: 2.0.x
last_published_version: 2.0.x-dev
secrets:
AWS_DEPLOY_KEY: ${{ secrets.AWS_DEPLOY_KEY }}
AWS_HOSTNAME: ${{ secrets.AWS_HOSTNAME_STABLE }}
AWS_USER: ${{ secrets.AWS_USER }}
APP_SECRET: ${{ secrets.APP_SECRET }}
POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
PACKAGIST_URL: ${{ secrets.PACKAGIST_URL }}
36 changes: 8 additions & 28 deletions api/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,12 @@
"doctrine/doctrine-bundle": "^2.7",
"doctrine/doctrine-migrations-bundle": "^3.2",
"doctrine/orm": "^2.12",
"gally/gally-premium": "dev-master",
"gally/gally-standard": "dev-master",
"gally/gally-standard": "2.0.x-dev",
"hautelook/alice-bundle": "2.11.0",
"lexik/jwt-authentication-bundle": "^2.14",
"nelmio/cors-bundle": "^2.2",
"opensearch-project/opensearch-php": "2.2.0",
"phpstan/phpdoc-parser": "^1.16",
"runtime/frankenphp-symfony": "^0.2",
"stof/doctrine-extensions-bundle": "^1.7",
"symfony/asset": "6.4.*",
"symfony/console": "6.4.*",
Expand All @@ -40,7 +38,7 @@
"symfony/uid": "6.4.*",
"symfony/validator": "6.4.*",
"symfony/yaml": "6.4.*",
"webonyx/graphql-php": "^14.11"
"webonyx/graphql-php": "^15.12"
},
"require-dev": {
"api-platform/schema-generator": "^5.0",
Expand Down Expand Up @@ -93,11 +91,13 @@
"paragonie/random_compat": "2.*",
"symfony/polyfill-ctype": "*",
"symfony/polyfill-iconv": "*",
"symfony/polyfill-intl-grapheme": "*",
"symfony/polyfill-intl-normalizer": "*",
"symfony/polyfill-mbstring": "*",
"symfony/polyfill-php82": "*",
"symfony/polyfill-php81": "*",
"symfony/polyfill-php80": "*",
"symfony/polyfill-php74": "*",
"symfony/polyfill-php73": "*",
"symfony/polyfill-php72": "*",
"symfony/polyfill-php71": "*"
"symfony/polyfill-php72": "*"
},
"scripts": {
"auto-scripts": {
Expand Down Expand Up @@ -128,25 +128,5 @@
}
}
},
"repositories": {
"gally-premium": {
"type": "path",
"url": "./packages/gally-premium",
"options": {
"versions": {
"gally/gally-premium": "dev-master"
}
}
},
"gally-standard": {
"type": "path",
"url": "./packages/gally-standard",
"options": {
"versions": {
"gally/gally-standard": "dev-master"
}
}
}
},
"botis" : "todo upgrade opensearch-project/opensearch-php to 2.3 by using version ^2.1 and then remove this line"
}
Loading

0 comments on commit 2bd7c32

Please sign in to comment.