diff options
author | Vijay A <vraravam@users.noreply.github.com> | 2022-04-29 06:49:04 -0500 |
---|---|---|
committer | Vijay A <vraravam@users.noreply.github.com> | 2022-04-29 06:55:10 -0500 |
commit | 659931a79bb62ae2cca90fd921277830effa0d7d (patch) | |
tree | c24dfeddcda2d3292ce876533815bdb8f0b19302 /.github/workflows | |
parent | Update submodules, browserslist data updates and linter fixes [skip ci] (diff) | |
download | ferdium-app-659931a79bb62ae2cca90fd921277830effa0d7d.tar.gz ferdium-app-659931a79bb62ae2cca90fd921277830effa0d7d.tar.zst ferdium-app-659931a79bb62ae2cca90fd921277830effa0d7d.zip |
Use 'fetch-depth: 0' to pull in all history (trying to see if the submodule-update issue gets fixed)
Diffstat (limited to '.github/workflows')
-rw-r--r-- | .github/workflows/builds.yml | 15 | ||||
-rw-r--r-- | .github/workflows/dependency-updates.yml | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index ab91c3205..8902d60f8 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml | |||
@@ -59,6 +59,15 @@ jobs: | |||
59 | git config user.name github-actions | 59 | git config user.name github-actions |
60 | git config user.email github-actions@github.com | 60 | git config user.email github-actions@github.com |
61 | 61 | ||
62 | # TODO: Need to check if this is required, keeping for future reference (can be removed if the submodule-update issue is resolved with other changes in this commit) | ||
63 | # Defensive: update submodules in the develop branch | ||
64 | # git checkout develop | ||
65 | # git submodule update --init --recursive --remote --rebase --force | ||
66 | # git add . | ||
67 | # git commit -am "Update submodules [skip ci]" --no-verify || true | ||
68 | # git push origin develop --no-verify | ||
69 | # git checkout - | ||
70 | |||
62 | CHANGES_COUNT=$(git diff --shortstat origin/develop | wc -l) | 71 | CHANGES_COUNT=$(git diff --shortstat origin/develop | wc -l) |
63 | MANUAL_REBUILD="${{ github.event_name == 'workflow_dispatch' }}" | 72 | MANUAL_REBUILD="${{ github.event_name == 'workflow_dispatch' }}" |
64 | VERSION_BUMP="${{ contains(github.event.inputs.message, '[version bump]') }}" | 73 | VERSION_BUMP="${{ contains(github.event.inputs.message, '[version bump]') }}" |
@@ -110,12 +119,14 @@ jobs: | |||
110 | if: ${{ github.event_name == 'schedule' || env.MANUAL_REBUILD_ON_NIGHTLY == 'true' }} | 119 | if: ${{ github.event_name == 'schedule' || env.MANUAL_REBUILD_ON_NIGHTLY == 'true' }} |
111 | with: | 120 | with: |
112 | submodules: recursive | 121 | submodules: recursive |
122 | fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging | ||
113 | ref: nightly | 123 | ref: nightly |
114 | - name: Checkout code along with submodules for any branch if the trigger event is NOT 'scheduled' and this is NOT a forced rebuild on the nightly branch | 124 | - name: Checkout code along with submodules for any branch if the trigger event is NOT 'scheduled' and this is NOT a forced rebuild on the nightly branch |
115 | uses: actions/checkout@v3 | 125 | uses: actions/checkout@v3 |
116 | if: ${{ github.event_name != 'schedule' && env.MANUAL_REBUILD_ON_NIGHTLY != 'true' }} | 126 | if: ${{ github.event_name != 'schedule' && env.MANUAL_REBUILD_ON_NIGHTLY != 'true' }} |
117 | with: | 127 | with: |
118 | submodules: recursive | 128 | submodules: recursive |
129 | fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging | ||
119 | - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off) | 130 | - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off) |
120 | run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV | 131 | run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV |
121 | shell: bash | 132 | shell: bash |
@@ -195,12 +206,14 @@ jobs: | |||
195 | if: ${{ github.event_name == 'schedule' || env.MANUAL_REBUILD_ON_NIGHTLY == 'true' }} | 206 | if: ${{ github.event_name == 'schedule' || env.MANUAL_REBUILD_ON_NIGHTLY == 'true' }} |
196 | with: | 207 | with: |
197 | submodules: recursive | 208 | submodules: recursive |
209 | fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging | ||
198 | ref: nightly | 210 | ref: nightly |
199 | - name: Checkout code along with submodules for any branch if the trigger event is NOT 'scheduled' and this is NOT a forced rebuild on the nightly branch | 211 | - name: Checkout code along with submodules for any branch if the trigger event is NOT 'scheduled' and this is NOT a forced rebuild on the nightly branch |
200 | uses: actions/checkout@v3 | 212 | uses: actions/checkout@v3 |
201 | if: ${{ github.event_name != 'schedule' && env.MANUAL_REBUILD_ON_NIGHTLY != 'true' }} | 213 | if: ${{ github.event_name != 'schedule' && env.MANUAL_REBUILD_ON_NIGHTLY != 'true' }} |
202 | with: | 214 | with: |
203 | submodules: recursive | 215 | submodules: recursive |
216 | fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging | ||
204 | - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off) | 217 | - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off) |
205 | run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV | 218 | run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV |
206 | shell: bash | 219 | shell: bash |
@@ -299,12 +312,14 @@ jobs: | |||
299 | if: ${{ github.event_name == 'schedule' || env.MANUAL_REBUILD_ON_NIGHTLY == 'true' }} | 312 | if: ${{ github.event_name == 'schedule' || env.MANUAL_REBUILD_ON_NIGHTLY == 'true' }} |
300 | with: | 313 | with: |
301 | submodules: recursive | 314 | submodules: recursive |
315 | fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging | ||
302 | ref: nightly | 316 | ref: nightly |
303 | - name: Checkout code along with submodules for any branch if the trigger event is NOT 'scheduled' and this is NOT a forced rebuild on the nightly branch | 317 | - name: Checkout code along with submodules for any branch if the trigger event is NOT 'scheduled' and this is NOT a forced rebuild on the nightly branch |
304 | uses: actions/checkout@v3 | 318 | uses: actions/checkout@v3 |
305 | if: ${{ github.event_name != 'schedule' && env.MANUAL_REBUILD_ON_NIGHTLY != 'true' }} | 319 | if: ${{ github.event_name != 'schedule' && env.MANUAL_REBUILD_ON_NIGHTLY != 'true' }} |
306 | with: | 320 | with: |
307 | submodules: recursive | 321 | submodules: recursive |
322 | fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging | ||
308 | - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off) | 323 | - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off) |
309 | run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV | 324 | run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV |
310 | shell: bash | 325 | shell: bash |
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml index 482d7f7a1..93b1b9b79 100644 --- a/.github/workflows/dependency-updates.yml +++ b/.github/workflows/dependency-updates.yml | |||
@@ -27,6 +27,7 @@ jobs: | |||
27 | uses: actions/checkout@v3 | 27 | uses: actions/checkout@v3 |
28 | with: | 28 | with: |
29 | submodules: recursive | 29 | submodules: recursive |
30 | fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging | ||
30 | - name: Extract Git branch name and commit from the currently checked out branch (not from the branch where this run was kicked off) | 31 | - name: Extract Git branch name and commit from the currently checked out branch (not from the branch where this run was kicked off) |
31 | run: | | 32 | run: | |
32 | echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV | 33 | echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV |