Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: now uses more than one job #33

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/bumpVersion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ new="version: $newAppVersionName+$newAppVersionCode"
sed -i "s/$old/$new/g" pubspec.yaml
# --> MacOS
# sed -i '' "s/$old/$new/g" pubspec.yaml
git add pubspec.yaml
# git add pubspec.yaml
26 changes: 13 additions & 13 deletions .github/workflows/development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
name: Development
jobs:
build:
name: Prepare-Build-Upload
name: Build-Upload
runs-on: ubuntu-latest
steps:
- name: Checkout code
Expand All @@ -27,20 +27,20 @@ jobs:
echo "${{ secrets.KEYSTORE }}" > sound-on-fire.jks.asc
gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch sound-on-fire.jks.asc > android/sound-on-fire.jks

- name: VB Step 1
- name: Update build number
if: github.ref != 'refs/heads/master' && github.repository == 'timoknapp/sound-on-fire'
run: ./.github/scripts/bumpVersion.sh

- name: VB Step 2
if: github.ref != 'refs/heads/master' && github.repository == 'timoknapp/sound-on-fire'
uses: EndBug/add-and-commit@v4
with:
author_name: timoknapp
author_email: [email protected]
message: "chore(version): bump commit hash"
add: "pubspec.yaml"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
./.github/scripts/bumpVersion.sh
git config user.name "${{ github.actor }}"
git config user.email "${{ github.actor }}@users.noreply.github.com"
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
git checkout -b ${{ github.head_ref }}
git add pubspec.yaml
git commit -m "chore(version): bump build number"
git pull
git push origin HEAD:${{ github.head_ref }}

- name: Setup Java
uses: actions/setup-java@v1
Expand All @@ -52,7 +52,7 @@ jobs:
with:
channel: "stable" # or: 'dev' or 'beta'

- name: Prepare & Build
- name: Build
id: prepare-build
run: |
./.github/scripts/buildAndroid.sh beta "${{ secrets.KEYSTORE_PASSWORD }}" "${{ secrets.KEY_PASSWORD }}" "${{ secrets.KEY_ALIAS }}" "${{ secrets.APP_CENTER_SECRET }}"
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ description: A SoundCloud app for FireTV.
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.3.0+117
version: 1.3.0+118

environment:
sdk: ">=2.1.0 <3.0.0"
Expand Down