diff options
| author |  Markus Hatvan <markus_hatvan@aon.at> | 2021-09-08 20:00:57 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-09-08 20:00:57 +0200 |
| commit | ba60887ef946323ab23607f63017292cf5990e8b (patch) | |
| tree | e3cb1c60d5e0299e796c9e9096c8821572735da8 /.github | |
| parent | Ability for service recipe to expose known certificate hosts (#1890) (diff) | |
| download | ferdium-app-ba60887ef946323ab23607f63017292cf5990e8b.tar.gz ferdium-app-ba60887ef946323ab23607f63017292cf5990e8b.tar.zst ferdium-app-ba60887ef946323ab23607f63017292cf5990e8b.zip | |
fix: U2F devices not recognised in snapcraft image (#1892)
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ferdi-builds.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml index c17011d69..62e04b361 100644 --- a/.github/workflows/ferdi-builds.yml +++ b/.github/workflows/ferdi-builds.yml | |||
| @@ -45,7 +45,7 @@ jobs: | |||
| 45 | with: | 45 | with: |
| 46 | ref: nightly | 46 | ref: nightly |
| 47 | submodules: recursive | 47 | submodules: recursive |
| 48 | fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging | 48 | fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging |
| 49 | - id: should_run | 49 | - id: should_run |
| 50 | name: Check whether there are any commits since this run was last triggered and push them and/or set the output | 50 | name: Check whether there are any commits since this run was last triggered and push them and/or set the output |
| 51 | if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} | 51 | if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} |
| @@ -262,7 +262,7 @@ jobs: | |||
| 262 | run: | | 262 | run: | |
| 263 | sudo snap install snapcraft --classic | 263 | sudo snap install snapcraft --classic |
| 264 | echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - | 264 | echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - |
| 265 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.publish.repo=nightlies -c.snap.publish.provider=snapStore -c.snap.publish.repo=nightlies -c.snap.publish.channels=edge | 265 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.publish.repo=nightlies -c.snap.publish.provider=snapStore -c.snap.publish.repo=nightlies -c.snap.publish.channels=edge -c.snap.plugs="['default', 'u2f-devices']" |
| 266 | snapcraft logout | 266 | snapcraft logout |
| 267 | shell: bash | 267 | shell: bash |
| 268 | - name: Build Ferdi with publish for 'release' beta branch | 268 | - name: Build Ferdi with publish for 'release' beta branch |
| @@ -274,7 +274,7 @@ jobs: | |||
| 274 | run: | | 274 | run: | |
| 275 | sudo snap install snapcraft --classic | 275 | sudo snap install snapcraft --classic |
| 276 | echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - | 276 | echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - |
| 277 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.publish.repo=ferdi -c.snap.publish.provider=snapStore -c.snap.publish.repo=ferdi -c.snap.publish.channels=beta | 277 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.publish.repo=ferdi -c.snap.publish.provider=snapStore -c.snap.publish.repo=ferdi -c.snap.publish.channels=beta -c.snap.plugs="['default', 'u2f-devices']" |
| 278 | snapcraft logout | 278 | snapcraft logout |
| 279 | shell: bash | 279 | shell: bash |
| 280 | - name: Build Ferdi with publish for 'release' stable branch | 280 | - name: Build Ferdi with publish for 'release' stable branch |
| @@ -286,7 +286,7 @@ jobs: | |||
| 286 | run: | | 286 | run: | |
| 287 | sudo snap install snapcraft --classic | 287 | sudo snap install snapcraft --classic |
| 288 | echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - | 288 | echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - |
| 289 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.publish.repo=ferdi -c.snap.publish.provider=snapStore -c.snap.publish.repo=ferdi -c.snap.publish.channels=stable | 289 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.publish.repo=ferdi -c.snap.publish.provider=snapStore -c.snap.publish.repo=ferdi -c.snap.publish.channels=stable -c.snap.plugs="['default', 'u2f-devices']" |
| 290 | snapcraft logout | 290 | snapcraft logout |
| 291 | shell: bash | 291 | shell: bash |
| 292 | 292 | ||