Skip to content

Commit a62ef07

Browse files
rolandgeiderrolandgeider
committed
Merge branch 'master' into fork/yashas-hm/yhm/issue-732
# Conflicts: # AUTHORS.md # pubspec.yaml # test/workout/goldens/routine_logs_screen_detail.png # test/workout/routine_logs_screen_test.dart
2 parents 657428e + 1cd0cab commit a62ef07

File tree

206 files changed

+4838
-2091
lines changed

Some content is hidden

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

206 files changed

+4838
-2091
lines changed

‎.github/ISSUE_TEMPLATE/1_bug.md‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/1_bug.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-issue-forms
2+
# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema
3+
4+
name: Bug report
5+
description: Report an error or unexpected behavior
6+
type: bug
7+
body:
8+
- type: dropdown
9+
id: priority
10+
attributes:
11+
label: Priority/Impact
12+
description: How severe is the issue?
13+
options:
14+
- Low (minor inconvenience)
15+
- Medium (affects some functionality)
16+
- High (critical issue, blocks workflow)
17+
18+
- type: textarea
19+
id: description
20+
attributes:
21+
label: Description
22+
description: |
23+
A clear and concise description of the bug.
24+
placeholder: |
25+
Please include any information you think is relevant to the issue you are experiencing.
26+
This could include any steps to reproduce it (if it happens consistently), expected vs.
27+
actual behavior, logs, screenshots, links to related issues, etc.
28+
validations:
29+
required: true
30+
31+
- type: input
32+
id: server-version
33+
attributes:
34+
label: Server version
35+
description: |
36+
What version of wger are you using and how did you install it (you use our server,
37+
docker compose, manual installation, etc)?
38+
placeholder: |
39+
Check https://<server>/software/about-us or the git sha1 of the last commit you pulled
40+
validations:
41+
required: false
42+
43+
- type: input
44+
id: app-version
45+
attributes:
46+
label: Mobile app version
47+
description: |
48+
What version of the mobile app are you using and how did you install it
49+
(Play Store, App Store, Flathub, self compiled, etc.)?
50+
placeholder: |
51+
Check the "about wger" dialog
52+
validations:
53+
required: false

‎.github/ISSUE_TEMPLATE/2_feature_request.md‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/2_feature_request.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Feature request
2+
description: Suggest a new idea for wger
3+
type: enhancement
4+
body:
5+
- type: textarea
6+
id: description
7+
attributes:
8+
label: Use case
9+
description: |
10+
A description of what new feature or behavior you would like to see.
11+
validations:
12+
required: true
13+
14+
- type: textarea
15+
id: proposal
16+
attributes:
17+
label: Proposal
18+
description: |
19+
Why is this feature needed? What problems does it solve?
20+
validations:
21+
required: false
22+
23+
- type: textarea
24+
id: additional-context
25+
attributes:
26+
label: Additional Context
27+
description: |
28+
Any extra details, related issues, or mockups
29+
placeholder: |
30+
Screenshots or mockups, links to similar features in other applications, or other relevant
31+
information.
32+
validations:
33+
required: false

‎.github/actions/flutter-common/action.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: 'Flutter common setup'
2+
description: 'Common steps needed to setup the application'
3+
4+
runs:
5+
using: "composite"
6+
steps:
7+
8+
- name: Setup Flutter
9+
uses: subosito/flutter-action@v2
10+
with:
11+
channel: stable
12+
flutter-version: 3.29.2
13+
cache: true
14+
15+
- name: Install Flutter dependencies
16+
run: flutter pub get
17+
shell: bash
18+
19+
- name: Install Flutter dependencies
20+
run: |
21+
dart --version
22+
flutter --version
23+
shell: bash

‎.github/pull_request_template.md‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,17 @@
1-
## Description (Proposed Changes)
2-
(Please try to mention in bullet points.)
1+
# Proposed Changes
32

43
-
54
-
65

7-
## Link to the issue :
6+
## Related Issue(s)
87

9-
(Add link of the issue you have proposed changes to)
8+
If applicable, please link to any related issues (`Closes #123`,
9+
`Closes wger-project/other-repo#123`, `See also #123`, etc.)
1010

11-
- Link :
11+
## Please check that the PR fulfills these requirements
1212

13-
## Tests
14-
15-
Please make sure to add tests when implementing new features.
16-
17-
## Checklist
18-
19-
Please check that the PR fulfills all requirements listed below by checking the relevant checkboxes (`[x]`). This will ensure a smooth and quick review process.
20-
21-
- [ ] Set a 100 character limit in your editor/IDE to avoid white space diffs in the PR
2213
- [ ] Tests for the changes have been added (for bug fixes / features)
23-
- [ ] Added yourself to AUTHORS.md
14+
- [ ] Set a 100 character limit in your editor/IDE to avoid white space diffs in the PR
15+
(run `dart format --line-length=100 .`)
2416
- [ ] Updated/added relevant documentation (doc comments with `///`).
2517
- [ ] Added relevant reviewers.

‎.github/workflows/build-android.yml‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
name: Build Android
2+
on:
3+
workflow_call:
4+
inputs:
5+
ref:
6+
required: true
7+
type: string
8+
secrets:
9+
DECRYPTKEY_PLAYSTORE_SIGNING_KEY:
10+
required: true
11+
DECRYPTKEY_PROPERTIES:
12+
required: true
13+
jobs:
14+
build_android_apk:
15+
name: APK file
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Checkout application
19+
uses: actions/checkout@v4
20+
with:
21+
ref: ${{ inputs.ref }}
22+
23+
- name: Common flutter setup
24+
uses: ./.github/actions/flutter-common
25+
26+
- name: Decrypt config files
27+
run: |
28+
cd ./fastlane/metadata/envfiles
29+
chmod +x ./decrypt_secrets.sh
30+
./decrypt_secrets.sh
31+
shell: bash
32+
env:
33+
DECRYPTKEY_PLAYSTORE_SIGNING_KEY: ${{ secrets.DECRYPTKEY_PLAYSTORE_SIGNING_KEY }}
34+
DECRYPTKEY_PROPERTIES: ${{ secrets.DECRYPTKEY_PROPERTIES }}
35+
36+
- name: Build APK
37+
run: flutter build apk --release
38+
39+
- uses: actions/upload-artifact@v4
40+
with:
41+
name: builds-apk
42+
path: build/app/outputs/flutter-apk/app-release.apk
43+
44+
build_android_aab:
45+
name: AAB file
46+
runs-on: ubuntu-latest
47+
steps:
48+
- name: Checkout application
49+
uses: actions/checkout@v4
50+
with:
51+
ref: ${{ inputs.ref }}
52+
53+
- name: Common setup
54+
uses: ./.github/actions/flutter-common
55+
56+
- name: Decrypt config files
57+
run: |
58+
cd ./fastlane/metadata/envfiles
59+
chmod +x ./decrypt_secrets.sh
60+
./decrypt_secrets.sh
61+
shell: bash
62+
env:
63+
DECRYPTKEY_PLAYSTORE: ${{ secrets.DECRYPTKEY_PLAYSTORE }}
64+
DECRYPTKEY_PLAYSTORE_SIGNING_KEY: ${{ secrets.DECRYPTKEY_PLAYSTORE_SIGNING_KEY }}
65+
DECRYPTKEY_PROPERTIES: ${{ secrets.DECRYPTKEY_PROPERTIES }}
66+
67+
- name: Build AAB
68+
run: flutter build appbundle --release
69+
70+
- uses: actions/upload-artifact@v4
71+
with:
72+
name: builds-aab
73+
path: build/app/outputs/bundle/release/app-release.aab

‎.github/workflows/build-apple.yml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Build Apple
2+
on:
3+
workflow_call:
4+
inputs:
5+
ref:
6+
required: true
7+
type: string
8+
jobs:
9+
build_ios:
10+
name: iOS
11+
runs-on: macos-latest
12+
steps:
13+
- name: Checkout application
14+
uses: actions/checkout@v4
15+
with:
16+
ref: ${{ inputs.ref }}
17+
18+
- name: Common flutter setup
19+
uses: ./.github/actions/flutter-common
20+
21+
- name: Build .app
22+
run: flutter build ios --release --no-codesign
23+
24+
- uses: actions/upload-artifact@v4
25+
with:
26+
name: builds-ios
27+
path: build/ios/iphoneos/Runner.app
28+
29+
build_macos:
30+
name: macOS
31+
runs-on: macos-latest
32+
steps:
33+
- name: Checkout application
34+
uses: actions/checkout@v4
35+
with:
36+
ref: ${{ inputs.ref }}
37+
38+
- name: Common flutter setup
39+
uses: ./.github/actions/flutter-common
40+
41+
- name: Build .app
42+
run: flutter build macos --release
43+
44+
- uses: actions/upload-artifact@v4
45+
with:
46+
name: builds-macos
47+
path: build/macos/Build/Products/Release/wger.app

‎.github/workflows/build-linux.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Build Linux
2+
on:
3+
workflow_call:
4+
inputs:
5+
ref:
6+
required: true
7+
type: string
8+
jobs:
9+
build_linux:
10+
name: Flathub
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout application
14+
uses: actions/checkout@v4
15+
with:
16+
ref: ${{ inputs.ref }}
17+
18+
- name: Common setup
19+
uses: ./.github/actions/flutter-common
20+
21+
# Compare with list of available packages on the runner:
22+
# https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
23+
- name: Build application for linux
24+
run: |
25+
# ninja-build
26+
sudo apt update
27+
sudo apt install -y pkg-config libgtk-3-dev liblzma-dev libstdc++-12-dev --no-install-recommends
28+
flutter build linux --release
29+
cd flatpak/scripts
30+
dart pub get
31+
dart flatpak_packager.dart --meta ../flatpak_meta.json --addTodaysVersion ${{inputs.ref}}
32+
33+
- uses: actions/upload-artifact@v4
34+
with:
35+
name: builds-linux
36+
path: |
37+
flatpak/scripts/flatpak_generator_exports/wger-linux-x86_64.tar.gz
38+
flatpak/scripts/flatpak_generator_exports/wger-linux-x86_64.sha256

0 commit comments

Comments
 (0)