Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PM-7276] Setup Bitwarden F-Droid repo #3

Merged
merged 10 commits into from
Aug 27, 2024

Conversation

SaintPatrck
Copy link
Contributor

🎟️ Tracking

PM-7276

📔 Objective

Setup Bitwarden F-Droid repository.

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • ❓ (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • ❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

@SaintPatrck SaintPatrck requested a review from a team August 13, 2024 20:52
Copy link

github-actions bot commented Aug 13, 2024

Logo
Checkmarx One – Scan Summary & Detailsea871d6e-98ec-43e3-b5f5-ba6959519545

New Issues

Severity Issue Source File / Package Checkmarx Insight
MEDIUM Unpinned Actions Full Length Commit SHA /fdroid.yml: 46 Pinning an action to a full length commit SHA is currently the only way to use an action as an immutable release. Pinning to a particular SHA helps...

Copy link
Contributor Author

@SaintPatrck SaintPatrck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left comments at points of interest.

metascoop/apps/info.go Show resolved Hide resolved
metascoop/main.go Show resolved Hide resolved
metascoop/main.go Show resolved Hide resolved
Comment on lines 72 to 80
- name: Configure F-Droid server
env:
FDROID_STORE_KEYSTORE_PASSWORD: ${{ secrets.FDROID_STORE_KEYSTORE_PASSWORD }}
run: |
chmod 600 fdroid/config.yml
echo "keypass: $FDROID_STORE_KEYSTORE_PASSWORD" >> fdroid/config.yml
echo "keystorepass: $FDROID_STORE_KEYSTORE_PASSWORD" >> fdroid/config.yml
echo "archive_older: 0" >> fdroid/config.yml
echo "repo_url: https://raw.githubusercontent.com/bitwarden/fdroid/main/fdroid/repo" >> fdroid/config.yml
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is how the current F-Droid config.yml is being constructed in bitwarden/mobile. Depending on how https://bitwarden.atlassian.net/servicedesk/customer/portal/5/TSD-797 is resolved, this may change. I have recommended that config.yml be stored as a precompiled file in Azure Vault instead of compiling it during workflow execution.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Storing the completed config.yml file in an Azure Storage Account will work great.

apps.yaml Outdated Show resolved Hide resolved
apps.yaml Outdated Show resolved Hide resolved
Comment on lines +25 to +26
git config --local user.name 'Bitwarden CI'
git config --local user.email '[email protected]'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double check these values are correct. They were copied from the bitwarden/mobile workflow.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vgrassia Is this ok for this PR? As a future enhancement, should we transition to the version bump automation pattern using the devops bot?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would say keep it this way for now as it seems clearer instead of using the DevOps bot pattern.

.github/workflows/fdroid.yml Outdated Show resolved Hide resolved
Comment on lines 72 to 80
- name: Configure F-Droid server
env:
FDROID_STORE_KEYSTORE_PASSWORD: ${{ secrets.FDROID_STORE_KEYSTORE_PASSWORD }}
run: |
chmod 600 fdroid/config.yml
echo "keypass: $FDROID_STORE_KEYSTORE_PASSWORD" >> fdroid/config.yml
echo "keystorepass: $FDROID_STORE_KEYSTORE_PASSWORD" >> fdroid/config.yml
echo "archive_older: 0" >> fdroid/config.yml
echo "repo_url: https://raw.githubusercontent.com/bitwarden/fdroid/main/fdroid/repo" >> fdroid/config.yml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Storing the completed config.yml file in an Azure Storage Account will work great.

metascoop/apps/info.go Outdated Show resolved Hide resolved
@SaintPatrck SaintPatrck marked this pull request as ready for review August 15, 2024 20:46
@SaintPatrck SaintPatrck requested review from vgrassia and a team August 19, 2024 16:24
@SaintPatrck SaintPatrck force-pushed the PM-7276/setup-fdroid-distribution branch from 3435812 to 1daeb8b Compare August 26, 2024 17:20
git config --local user.email '[email protected]'

git add .
git commit -m"Automated update"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

More of a note to self and nothing we need to change in this PR, listing the apps that were updated would be a visibility / transparency quick win 🤔

Copy link
Member

@vvolkgang vvolkgang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome work here @SaintPatrck ! 👏🏾

We defined a list of enhancements for future PRs, as is this PR will help us test the whole process and see if we missed anything.

Warning

For the time being this will process GitHub Pre-releases as normal releases. This is an intentional decision for testing purposes, so we can find any issues ahead of our GA update release. Pre-release prod builds will be removed from the F-Droid repo when we're done.

.github/workflows/fdroid.yml Show resolved Hide resolved
.github/workflows/fdroid.yml Outdated Show resolved Hide resolved
.github/workflows/fdroid.yml Outdated Show resolved Hide resolved
.github/workflows/fdroid.yml Outdated Show resolved Hide resolved
.github/workflows/fdroid.yml Outdated Show resolved Hide resolved
.github/workflows/fdroid.yml Outdated Show resolved Hide resolved
@SaintPatrck SaintPatrck merged commit aa7f8d2 into main Aug 27, 2024
3 of 4 checks passed
@SaintPatrck SaintPatrck deleted the PM-7276/setup-fdroid-distribution branch August 27, 2024 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants