diff --git a/.github/workflows/deploy-nightly-testflight.yml b/.github/workflows/deploy-nightly-testflight.yml index 254927f54b..5b31c205fb 100644 --- a/.github/workflows/deploy-nightly-testflight.yml +++ b/.github/workflows/deploy-nightly-testflight.yml @@ -1,11 +1,8 @@ name: Deploy Nightly Testflight Release on: -# schedule: -# - cron: '0 5 * * *' - push: - branches: - - hailey/use-eas-version-code + schedule: + - cron: '0 5 * * *' jobs: build: @@ -40,16 +37,5 @@ jobs: - name: Install dependencies run: yarn install -# - name: Bump build number -# run: yarn bump:ios - - name: EAS build and submit - run: eas build -p ios --profile production --non-interactive - -# - name: Commit -# uses: stefanzweifel/git-auto-commit-action@v5 -# with: -# commit_message: Nightly iOS Build Bump -# branch: main -# commit_user_name: github-actions[bot] -# commit_user_email: github-actions[bot]@users.noreply.github.com + run: eas build -p ios --profile production --auto-submit --non-interactive diff --git a/eas.json b/eas.json index 52a52cdd45..7db7d386d2 100644 --- a/eas.json +++ b/eas.json @@ -29,7 +29,11 @@ "production": { "extends": "base", "ios": { - "resourceClass": "large" + "resourceClass": "large", + "autoIncrement": true + }, + "android": { + "autoIncrement": true }, "channel": "production" } diff --git a/package.json b/package.json index 837a8d0e45..17d6f3d3a7 100644 --- a/package.json +++ b/package.json @@ -36,10 +36,7 @@ "intl:check": "yarn intl:extract && git diff-index -G'(^[^\\*# /])|(^#\\w)|(^\\s+[^\\*#/])' HEAD || (echo '\n⚠️ i18n detected un-extracted translations\n' && exit 1)", "intl:extract": "lingui extract", "intl:compile": "lingui compile", - "nuke": "rm -rf ./node_modules && rm -rf ./ios && rm -rf ./android", - "bump": "./scripts/bumpIosBuildNumber.sh && ./scripts/bumpAndroidBuildNumber.sh", - "bump:ios": "./scripts/bumpIosBuildNumber.sh", - "bump:android": "./scripts/bumpAndroidBuildNumber.sh" + "nuke": "rm -rf ./node_modules && rm -rf ./ios && rm -rf ./android" }, "dependencies": { "@atproto/api": "^0.9.5", diff --git a/scripts/bumpAndroidBuildNumber.sh b/scripts/bumpAndroidBuildNumber.sh deleted file mode 100755 index 105f1296d4..0000000000 --- a/scripts/bumpAndroidBuildNumber.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# The number here should always be the line number the iOS build variable is on -line=$(sed "30q;d" ./app.config.js) -currentBuildNumber=$(echo "$line" | grep -oE '[0-9]+([.][0-9]+)?') -newBuildNumber=$((currentBuildNumber+1)) -newBuildVariable="const ANDROID_VERSION_CODE = '$newBuildNumber'" -sed -i.bak "30s/.*/ $newBuildVariable/" ./app.config.js -rm -rf ./app.config.js.bak - -echo "Android build number bumped to $newBuildNumber" diff --git a/scripts/bumpIosBuildNumber.sh b/scripts/bumpIosBuildNumber.sh deleted file mode 100755 index b78d2e69db..0000000000 --- a/scripts/bumpIosBuildNumber.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# The number here should always be the line number the iOS build variable is on -line=$(sed "24q;d" ./app.config.js) -currentBuildNumber=$(echo "$line" | grep -oE '[0-9]+([.][0-9]+)?') -newBuildNumber=$((currentBuildNumber+1)) -newBuildVariable="const IOS_BUILD_NUMBER = '$newBuildNumber'" -sed -i.bak "24s/.*/ $newBuildVariable/" ./app.config.js -rm -rf ./app.config.js.bak - -echo "iOS build number bumped to $newBuildNumber"