Skip to content

Commit

Permalink
Merge branch 'master' into feature/1707-auto-accept
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/build_android.yml
  • Loading branch information
vladimir-8 committed Jul 2, 2024
2 parents 6551483 + f406812 commit 0b9e930
Show file tree
Hide file tree
Showing 28 changed files with 1,041 additions and 694 deletions.
86 changes: 86 additions & 0 deletions .detoxrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
/** @type {Detox.DetoxConfig} */
module.exports = {
testRunner: {
args: {
config: 'e2e/jest.config.js',
_: ['e2e'],
},
},
artifacts: {
plugins: {
screenshot: {
shouldTakeAutomaticSnapshots: true,
},
},
},
apps: {
'ios.debug': {
type: 'ios.app',
binaryPath:
'ios/build/Build/Products/Debug-iphonesimulator/CoopCycle.app',
build:
'xcodebuild -workspace ios/CoopCycle.xcworkspace -scheme CoopCycle -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build -quiet',
},
'ios.release': {
type: 'ios.app',
binaryPath:
'ios/build/Build/Products/Release-iphonesimulator/CoopCycle.app',
build:
'xcodebuild ONLY_ACTIVE_ARCH=YES -arch x86_64 -workspace ios/CoopCycle.xcworkspace -scheme CoopCycle -configuration Release -sdk iphonesimulator -derivedDataPath ios/build -quiet',
},
'android.debug': {
type: 'android.apk',
binaryPath:
'android/app/build/outputs/apk/official/debug/app-official-debug.apk',
build:
'cd android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug --warning-mode all && cd ..',
launchArgs: {},
},
'android.release': {
type: 'android.apk',
binaryPath:
'android/app/build/outputs/apk/official/release/app-official-release.apk',
build:
'cd android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release -DuseDebugCertificate=yes -DminifyEnabled=no -DuploadCrashlyticsMappingFile=no --warning-mode all && cd ..',
launchArgs: {},
},
},
devices: {
iosSimulator: {
type: 'ios.simulator',
device: { type: 'iPhone 15', os: 'iOS 17.4' },
},
androidEmulator: {
type: 'android.emulator',
device: { avdName: 'Pixel_8_API_34' },
},
attached: {
type: 'android.attached',
device: {
adbName: '.*', // any attached device
},
},
},
configurations: {
'ios.sim.debug': {
device: 'iosSimulator',
app: 'ios.debug',
},
'ios.sim.release': {
device: 'iosSimulator',
app: 'ios.release',
},
'android.emu.debug': {
device: 'androidEmulator',
app: 'android.debug',
},
'android.emu.release': {
device: 'androidEmulator',
app: 'android.release',
},
'android.att.release': {
device: 'attached',
app: 'android.release',
},
},
};
142 changes: 0 additions & 142 deletions .github/workflows/build.yml

This file was deleted.

24 changes: 1 addition & 23 deletions .github/workflows/build_android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@ run-name: >
${{ inputs.tag }}
${{ inputs.build_official && '; CoopCycle' || '' }}
${{ inputs.build_official_beta && '; CoopCycle (Beta)' || '' }}
${{ inputs.build_coursiers_stephanois && '; Les Coursiers Stéphanois' || '' }}
${{ inputs.build_naofood && '; Naofood' || '' }}
${{ inputs.build_zampate && '; Zampate' || '' }}
${{ inputs.build_kooglof && '; Kooglof' || '' }}
${{ inputs.build_robinfood && '; RobinFood' || '' }}
${{ inputs.build_coursiers_rennais && '; Les Coursiers Rennais' || '' }}
${{ inputs.build_coursiers_montpellier && '; Coursiers MTP' || '' }}
${{ inputs.build_eraman && '; Eraman' || '' }}
on:
workflow_dispatch:
inputs:
Expand All @@ -36,10 +34,6 @@ on:
description: 'Build CoopCycle beta app'
required: true
type: boolean
build_coursiers_stephanois:
description: 'Build Coursiers Stéphanois app'
required: true
type: boolean
build_naofood:
description: 'Build Naofood app'
required: true
Expand Down Expand Up @@ -116,22 +110,6 @@ jobs:
google_play_track: ${{ inputs.google_play_track }}
deploy_google_play: ${{ inputs.deploy_google_play }}
secrets: inherit
coursiers_stephanois:
if: ${{ inputs.build_coursiers_stephanois }}
name: Build Les Coursiers Stéphanois app
uses: ./.github/workflows/fastlane_android.yml
with:
tag: ${{ inputs.tag }}
instance: coursiers_stephanois
instance_url: https://coursiers-stephanois.coopcycle.org
app_name: Les Coursiers Stéphanois
primary_color: "#85b544"
package_name: fr.coopcycle.coursiers_stephanois
keystore_key_alias: instance
keystore_key_password_secret: SIGNING_KEY_PASSWORD_INSTANCE
google_play_track: ${{ inputs.google_play_track }}
deploy_google_play: ${{ inputs.deploy_google_play }}
secrets: inherit
kooglof:
if: ${{ inputs.build_kooglof }}
name: Build Kooglof app
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Test
on: [push, pull_request]
on: [push]
jobs:
LINT_AND_TEST:
env:
Expand Down
Loading

0 comments on commit 0b9e930

Please sign in to comment.