diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69e99547b26e9e7fb1adebe7bf719a15b5bc86b2..24c806300e1f1c8f735872cbf9399682c67c1ac7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,25 +1,16 @@ image: ghcr.io/cirruslabs/flutter:latest stages: - - update - build-debug - build-release - release - deploy -update: - stage: update - except: - - tags - script: - - flutter packages get - - flutter packages upgrade - interruptible: true - android:build-debug: stage: build-debug except: - tags + - master script: # Flutter local configuration - echo flutter.sdk=$FLUTTER_PATH > android/local.properties @@ -49,8 +40,6 @@ android:build-release: - master except: - tags - dependencies: - - android:build-debug script: # Flutter local configuration - echo flutter.sdk=$FLUTTER_PATH > android/local.properties @@ -121,4 +110,4 @@ android:deploy: dependencies: - application:release script: - - curl "${REPOSITORY_UPDATE_WEBHOOK}?token=${REPOSITORY_TOKEN}" + - curl "${REPOSITORY_UPDATE_WEBHOOK}?token=${REPOSITORY_TOKEN}" --fail diff --git a/android/gradle.properties b/android/gradle.properties index 135006f9c1386c8757595c43e890e911f732f5a3..85b94f88ee157e1d1b3cec184c8948902443d36f 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -app.versionName=0.0.6 -app.versionCode=6 +app.versionName=0.0.7 +app.versionCode=7 diff --git a/fastlane/metadata/android/en-US/changelogs/7.txt b/fastlane/metadata/android/en-US/changelogs/7.txt new file mode 100644 index 0000000000000000000000000000000000000000..c78c37f05542dbe46e57b314635001a9525a3c3d --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/7.txt @@ -0,0 +1 @@ +Improve CI/CD, remove "update" step, disable "build-debug" in master branch. diff --git a/fastlane/metadata/android/fr-FR/changelogs/7.txt b/fastlane/metadata/android/fr-FR/changelogs/7.txt new file mode 100644 index 0000000000000000000000000000000000000000..8ddc4d32c5d6b70854bd76c9afbf81b76b748ef3 --- /dev/null +++ b/fastlane/metadata/android/fr-FR/changelogs/7.txt @@ -0,0 +1 @@ +Amélioration de la CI/CD. Suppression de "update" et désactivation de "build-debug" sur master. diff --git a/pubspec.lock b/pubspec.lock index d3313f37b03ac1afcbd5b9b5a695d1d1b5471e24..03fa8f88b17c79c6bba02eb84694453caa60e662 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -101,10 +101,10 @@ packages: dependency: "direct main" description: name: easy_localization - sha256: "9c86754b22aaa3e74e471635b25b33729f958dd6fb83df0ad6612948a7b231af" + sha256: c145aeb6584aedc7c862ab8c737c3277788f47488bfdf9bae0fe112bd0a4789c url: "https://pub.dev" source: hosted - version: "3.0.4" + version: "3.0.5" easy_logger: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 04f16cee69b28f235fb6b7afc767f2f774219651..c7072694801d238b5b613a59ac10a399a4bdf81b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: stop motion assistant publish_to: 'none' -version: 0.0.6+6 +version: 0.0.7+7 environment: sdk: '^3.0.0'