Revert "fdroid.. just do it..."

This reverts commit 9876cd547f.
This commit is contained in:
Kyle Spearrin 2021-01-22 14:23:07 -05:00
parent 9876cd547f
commit 2bfabfd838

View file

@ -138,23 +138,23 @@ jobs:
android-ubuntu: android-ubuntu:
runs-on: ubuntu-latest runs-on: ubuntu-latest
# needs: android needs: android
steps: steps:
- name: Set up Node - name: Set up Node
if: github.ref == 'refs/heads/master' if: github.event_name == 'release'
uses: actions/setup-node@v1 uses: actions/setup-node@v1
with: with:
node-version: '10.x' node-version: '10.x'
- name: Set up F-Droid server - name: Set up F-Droid server
if: github.ref == 'refs/heads/master' if: github.event_name == 'release'
run: | run: |
sudo apt-get -qq update sudo apt-get -qq update
sudo apt-get -qqy install --no-install-recommends fdroidserver wget sudo apt-get -qqy install --no-install-recommends fdroidserver wget
- name: Set up git credentials - name: Set up git credentials
if: github.ref == 'refs/heads/master' if: github.event_name == 'release'
env: env:
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }} ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
run: | run: |
@ -164,7 +164,7 @@ jobs:
git config --global user.name "Bitwarden CI" git config --global user.name "Bitwarden CI"
- name: Print environment - name: Print environment
if: github.ref == 'refs/heads/master' if: github.event_name == 'release'
run: | run: |
node --version node --version
npm --version npm --version
@ -177,15 +177,15 @@ jobs:
GITHUB_EVENT: ${{ github.event_name }} GITHUB_EVENT: ${{ github.event_name }}
- name: Checkout repo - name: Checkout repo
if: github.ref == 'refs/heads/master' if: github.event_name == 'release'
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Install Node dependencies - name: Install Node dependencies
if: github.ref == 'refs/heads/master' if: github.event_name == 'release'
run: npm install run: npm install
- name: Decrypt secrets - name: Decrypt secrets
if: github.ref == 'refs/heads/master' if: github.event_name == 'release'
run: | run: |
./.github/scripts/decrypt-secret.ps1 -filename store_fdroid-keystore.jks.gpg ` ./.github/scripts/decrypt-secret.ps1 -filename store_fdroid-keystore.jks.gpg `
-output ./store/fdroid/keystore.jks -output ./store/fdroid/keystore.jks
@ -194,7 +194,7 @@ jobs:
DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }} DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
- name: Compile for F-Droid Store - name: Compile for F-Droid Store
if: github.ref == 'refs/heads/master' if: github.event_name == 'release'
run: | run: |
sudo chmod +x ./.github/scripts/android/compile-fdroid.sh sudo chmod +x ./.github/scripts/android/compile-fdroid.sh
./.github/scripts/android/compile-fdroid.sh ./.github/scripts/android/compile-fdroid.sh
@ -203,7 +203,7 @@ jobs:
RELEASE_TAG_NAME: ${{ github.event.release.tag_name }} RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
- name: Deploy to gh-pages - name: Deploy to gh-pages
if: github.ref == 'refs/heads/master' if: github.event_name == 'release'
run: npm run deploy run: npm run deploy
ios: ios: