Skip to content

Commit 2b99794

Browse files
authored
Merge branch 'main' into fastlane
2 parents 504305c + 47b9014 commit 2b99794

File tree

636 files changed

+7122
-3927
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

636 files changed

+7122
-3927
lines changed

.github/workflows/mobile.release.prod.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ jobs:
1616
steps:
1717
- name: Checkout code
1818
uses: actions/checkout@v3
19+
- name: Setup Java version
20+
uses: actions/setup-java@v4
21+
with:
22+
distribution: 'zulu'
23+
java-version: '17'
1924
- name: Export version from package.json
2025
run:
2126
echo "PACKAGE_VERSION=$(grep '"version"' ../web/package.json | cut -d '"' -f 4 | cut -d "-" -f 1)" >> $GITHUB_ENV
@@ -82,7 +87,11 @@ jobs:
8287
with:
8388
working-directory: 'packages/mobile'
8489
- name: Install dependencies
85-
run: yarn install --immutable && bundle install && yarn install:pods
90+
run: yarn install --immutable
91+
- name: Bundle install
92+
run: bundle install
93+
- name: Install pods
94+
run: yarn install:pods
8695
- run: yarn build:mobile
8796
- name: Set ssh connection to Github
8897
uses: webfactory/[email protected]

.github/workflows/publish.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,12 @@ jobs:
5353
- name: Build
5454
run: yarn build:snjs
5555
- name: Login to Docker Hub
56-
if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
5756
uses: docker/login-action@v2
5857
with:
5958
username: ${{ secrets.DOCKER_USERNAME }}
6059
password: ${{ secrets.DOCKER_PASSWORD }}
6160

6261
- name: Publish SNJS Docker image for E2E testing
63-
if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
6462
run: |
6563
yarn docker build @standardnotes/snjs -t standardnotes/snjs:${{ github.sha }}
6664
docker push standardnotes/snjs:${{ github.sha }}
@@ -185,13 +183,11 @@ jobs:
185183
runs-on: ubuntu-latest
186184
steps:
187185
- name: Login to Docker Hub
188-
if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
189186
uses: docker/login-action@v2
190187
with:
191188
username: ${{ secrets.DOCKER_USERNAME }}
192189
password: ${{ secrets.DOCKER_PASSWORD }}
193190
- name: Publish SNJS Docker image as stable
194-
if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
195191
run: |
196192
docker pull standardnotes/snjs:${{ github.sha }}
197193
docker tag standardnotes/snjs:${{ github.sha }} standardnotes/snjs:latest
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)