Skip to content

Commit

Permalink
replace instances of monorepo-setup by develop
Browse files Browse the repository at this point in the history
  • Loading branch information
valpinkman committed May 12, 2022
1 parent 81bf27d commit 10f98d0
Show file tree
Hide file tree
Showing 20 changed files with 93 additions and 93 deletions.
4 changes: 2 additions & 2 deletions .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"fixed": [],
"linked": [],
"access": "public",
"baseBranch": "monorepo-setup",
"baseBranch": "develop",
"updateInternalDependencies": "patch",
"ignore": []
}
}
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
Thank you for your contribution! 👍
Please make sure to read the [Contributing guidelines](https://github.com/LedgerHQ/ledger-live/blob/monorepo-setup/CONTRIBUTING.md) if you have not already.
Please make sure to read the [Contributing guidelines](https://github.com/LedgerHQ/ledger-live/blob/develop/CONTRIBUTING.md) if you have not already.
Disclaimer: Pull Requests that do not comply with the rules will be arbitrarily closed.
-->
Expand Down Expand Up @@ -32,7 +32,7 @@ _Write a clear and concise description of what this pull request is about and wh

### 🚀 Expectations to reach

_Please make sure you follow these [**Important Steps**](https://github.com/LedgerHQ/ledger-live/blob/monorepo-setup/CONTRIBUTING.md#important-steps)._
_Please make sure you follow these [**Important Steps**](https://github.com/LedgerHQ/ledger-live/blob/develop/CONTRIBUTING.md#important-steps)._

_Pull Requests must pass the CI and be internally validated in order to be merged._

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backup/version-or-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Version or Release
on:
push:
branches:
- monorepo-setup
- develop

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/build-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ concurrency:
jobs:
start-runner:
name: "start ec2 instance"
uses: ledgerhq/ledger-live/.github/workflows/start-linux-runner.yml@monorepo-setup
uses: ledgerhq/ledger-live/.github/workflows/start-linux-runner.yml@develop
with:
instance-type: c5.4xlarge
secrets:
Expand All @@ -31,7 +31,7 @@ jobs:
name: "stop ec2 instance"
if: ${{ always() && needs.start-runner.result == 'success' }}
needs: [start-runner, build-desktop-app-linux]
uses: ledgerhq/ledger-live/.github/workflows/stop-linux-runner.yml@monorepo-setup
uses: ledgerhq/ledger-live/.github/workflows/stop-linux-runner.yml@develop
with:
label: ${{ needs.start-runner.outputs.label }}
ec2-instance-id: ${{ needs.start-runner.outputs.ec2-instance-id }}
Expand Down Expand Up @@ -74,12 +74,12 @@ jobs:
./tools/g++-5.4/install.sh
- name: install dependencies
run: pnpm i --filter="ledger-live-desktop..." --filter="ledger-live" --frozen-lockfile --unsafe-perm
- uses: ledgerhq/ledger-live/tools/actions/get-package-infos@monorepo-setup
- uses: ledgerhq/ledger-live/tools/actions/get-package-infos@develop
id: version
with:
path: ${{ github.workspace }}/apps/ledger-live-desktop
- name: set beta name
uses: ledgerhq/ledger-live/tools/actions/change-product-name@monorepo-setup
uses: ledgerhq/ledger-live/tools/actions/change-product-name@develop
with:
path: ${{ github.workspace }}/apps/ledger-live-desktop
- name: build the app
Expand Down Expand Up @@ -123,12 +123,12 @@ jobs:
- name: install dependencies
run: pnpm i --filter="ledger-live-desktop..." --filter="ledger-live" --frozen-lockfile --unsafe-perm
shell: bash
- uses: ledgerhq/ledger-live/tools/actions/get-package-infos@monorepo-setup
- uses: ledgerhq/ledger-live/tools/actions/get-package-infos@develop
id: version
with:
path: ${{ github.workspace }}/apps/ledger-live-desktop
- name: set beta name
uses: ledgerhq/ledger-live/tools/actions/change-product-name@monorepo-setup
uses: ledgerhq/ledger-live/tools/actions/change-product-name@develop
with:
path: ${{ github.workspace }}/apps/ledger-live-desktop
- name: build the app
Expand Down Expand Up @@ -176,12 +176,12 @@ jobs:
run: |
eval "$(rbenv init - bash)"
pnpm i --filter="ledger-live-desktop..." --filter="ledger-live" -frozen-lockfile --unsafe-perm
- uses: ledgerhq/ledger-live/tools/actions/get-package-infos@monorepo-setup
- uses: ledgerhq/ledger-live/tools/actions/get-package-infos@develop
id: version
with:
path: ${{ github.workspace }}/apps/ledger-live-desktop
- name: set beta name
uses: ledgerhq/ledger-live/tools/actions/change-product-name@monorepo-setup
uses: ledgerhq/ledger-live/tools/actions/change-product-name@develop
with:
path: ${{ github.workspace }}/apps/ledger-live-desktop
- name: build the app
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-mobile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ concurrency:
jobs:
start-runner:
name: "start ec2 instance"
uses: ledgerhq/ledger-live/.github/workflows/start-linux-runner.yml@monorepo-setup
uses: ledgerhq/ledger-live/.github/workflows/start-linux-runner.yml@develop
with:
instance-type: c5.4xlarge
secrets:
Expand All @@ -28,7 +28,7 @@ jobs:
name: "stop ec2 instance"
if: ${{ always() && needs.start-runner.result == 'success' }}
needs: [start-runner, build-mobile-app-android]
uses: ledgerhq/ledger-live/.github/workflows/stop-linux-runner.yml@monorepo-setup
uses: ledgerhq/ledger-live/.github/workflows/stop-linux-runner.yml@develop
with:
label: ${{ needs.start-runner.outputs.label }}
ec2-instance-id: ${{ needs.start-runner.outputs.ec2-instance-id }}
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
with:
path: ${{ github.workspace }}/apps/ledger-live-mobile
- name: set beta name
uses: ledgerhq/ledger-live/tools/actions/change-product-name@monorepo-setup
uses: ledgerhq/ledger-live/tools/actions/change-product-name@develop
with:
path: ${{ github.workspace }}/apps/ledger-live-mobile
# - name: Get short SHA
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
console.log(`::set-output name=valid::${isValid}`)
if (!isValid) {
const body = `
Unfortunately this branch does not follow the [CONTRIBUTING.MD](https://github.com/LedgerHQ/ledger-live/blob/monorepo-setup/CONTRIBUTING.md) conventions and will be closed automatically.
Unfortunately this branch does not follow the [CONTRIBUTING.MD](https://github.com/LedgerHQ/ledger-live/blob/develop/CONTRIBUTING.md) conventions and will be closed automatically.
Feel free to reopen this PR once you have browsed through the guidelines.
`
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: merge develop # TODO: update the branch when we sanitize the monorepo
run: |
git merge origin/monorepo-setup -X theirs
git merge origin/develop -X theirs
- uses: pnpm/action-setup@v2.1.0
with:
Expand All @@ -43,12 +43,12 @@ jobs:
ruby-version: 2.7 # Not needed with a .ruby-version file
bundler-cache: true # runs 'bundle install' and caches installed gems automatically

- uses: ledgerhq/ledger-live/tools/actions/get-package-infos@monorepo-setup
- uses: ledgerhq/ledger-live/tools/actions/get-package-infos@develop
id: desktop-version
with:
path: ${{ github.workspace }}/apps/ledger-live-desktop

- uses: ledgerhq/ledger-live/tools/actions/get-package-infos@monorepo-setup
- uses: ledgerhq/ledger-live/tools/actions/get-package-infos@develop
id: mobile-version
with:
path: ${{ github.workspace }}/apps/ledger-live-mobile
Expand Down Expand Up @@ -77,12 +77,12 @@ jobs:
run: |
git push origin nightly --follow-tags
- uses: ledgerhq/ledger-live/tools/actions/get-package-infos@monorepo-setup
- uses: ledgerhq/ledger-live/tools/actions/get-package-infos@develop
id: post-desktop-version
with:
path: ${{ github.workspace }}/apps/ledger-live-desktop

- uses: ledgerhq/ledger-live/tools/actions/get-package-infos@monorepo-setup
- uses: ledgerhq/ledger-live/tools/actions/get-package-infos@develop
id: post-mobile-version
with:
path: ${{ github.workspace }}/apps/ledger-live-mobile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
with:
ruby-version: 2.7 # Not needed with a .ruby-version file
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
- uses: ledgerhq/ledger-live/tools/actions/get-package-infos@monorepo-setup
- uses: ledgerhq/ledger-live/tools/actions/get-package-infos@develop
id: desktop-version
with:
path: ${{ github.workspace }}/apps/ledger-live-desktop
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
run: |
git push origin ${{ steps.ref.outputs.ref }} --follow-tags
- uses: ledgerhq/ledger-live/tools/actions/get-package-infos@monorepo-setup
- uses: ledgerhq/ledger-live/tools/actions/get-package-infos@develop
id: post-desktop-version
with:
path: ${{ github.workspace }}/apps/ledger-live-desktop
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
shell: bash
- name: upload diffs to imgur
if: always() && !cancelled()
uses: ledgerhq/ledger-live/tools/actions/upload-images@monorepo-setup
uses: ledgerhq/ledger-live/tools/actions/upload-images@develop
id: imgur
with:
path: apps/ledger-live-desktop/tests/artifacts/test-results
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
fs.writeFileSync("./images.json", JSON.stringify(result, null, 2));
- name: prepare comment with screenshots
id: comment
uses: ledgerhq/ledger-live/tools/actions/prepare-comment-screenshots@monorepo-setup
uses: ledgerhq/ledger-live/tools/actions/prepare-comment-screenshots@develop
with:
images: images.json
- name: edit comment
Expand Down
Loading

0 comments on commit 10f98d0

Please sign in to comment.