Skip to content

Commit 652e0da

Browse files
committed
Updated templates.
1 parent ffe95f3 commit 652e0da

7 files changed

Lines changed: 137 additions & 38 deletions

File tree

.githooks/pre-push

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@
77
#
88
# If this script exits with a non-zero status nothing will be pushed.
99

10+
PVER=$(egrep '^version:' pubspec.yaml | cut -d' ' -f2 | cut -d'+' -f1)
11+
12+
if [ -d snap ]; then
13+
printf "\e[33;1m%s\e[0m\n" 'Update snap version.'
14+
perl -pi -e "s|^version:.*|version: ${PVER}|" snap/snapcraft.yaml;
15+
fi
16+
1017
# Flutter Analyze
1118

1219
printf "\e[33;1m%s\e[0m\n" 'Running flutter analyze.'

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ Flutter Version:
5454

5555
Checklist for closing the issue:
5656

57-
- [ ] `make test`
58-
- [ ] `make qtest`
59-
- [ ] [Task specific requirements.]
57+
- [ ] No errors from `make prep`
58+
- [ ] All tests pass `make qtest`
59+
- [ ] [Issue specific requirements.]

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ So that as a user I can [clear and concise benefit].
1818

1919
Checklist for closing the issue:
2020

21-
- [ ] All tests pass
21+
- [ ] No errors from `make prep`
22+
- [ ] All tests pass `make qtest`
23+
- [ ] [Issue specific requirements.]
2224

2325
## Alternatives
2426

.github/workflows/ci.yaml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
types: [opened, reopened, synchronize]
1414

1515
env:
16-
FLUTTER_VERSION: '3.35.6'
16+
FLUTTER_VERSION: '3.38.5'
1717

1818
jobs:
1919

@@ -104,20 +104,25 @@ jobs:
104104
uses: lycheeverse/lychee-action@v2
105105
with: # Don't fail for now but then create an issue - useful?
106106
args:
107-
--verbose
107+
--exclude-file .lycheeignore
108108
--no-progress
109+
'*.md'
110+
'./**/*.dart'
109111
'assets/**/*.md'
110112
'assets/**/*.html'
111-
'lib/**/*.dart'
112-
fail: false
113-
114-
- name: Create Issue From File
115-
if: steps.lychee.outputs.exit_code != 0
116-
uses: peter-evans/create-issue-from-file@v5
117-
with:
118-
title: Link Checker Report
119-
content-filepath: ./lychee/out.md
120-
labels: report, automated issue
113+
fail: true
114+
115+
# 20251030 gjw Remove the automatic creation of an issue for
116+
# now. It is creating too many and I am simply closing them. The
117+
# failure of the lint test itself should be enough.
118+
119+
# - name: Create Issue From File
120+
# if: steps.lychee.outputs.exit_code != 0
121+
# uses: peter-evans/create-issue-from-file@v5
122+
# with:
123+
# title: Link Checker Report
124+
# content-filepath: ./lychee/out.md
125+
# labels: report, automated issue
121126

122127
locmax:
123128
runs-on: ubuntu-latest

.gitignore

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,6 @@ migrate_working_dir/
9898

9999
.vscode/
100100

101-
# Flutter/Dart/Pub related
102-
**/doc/api/
103-
**/ios/Flutter/.last_build_id
104-
.dart_tool/
105-
.flutter-plugins
106-
.flutter-plugins-dependencies
107-
.pub-cache/
108-
.pub/
109-
/build/
110-
111101
# Symbolication related
112102
app.*.symbols
113103

@@ -158,6 +148,7 @@ analysis_benchmark.json
158148
.flutter-plugins-dependencies
159149
**/generated_plugin_registrant.dart
160150
.packages
151+
.pub-cache/
161152
.pub-preload-cache/
162153
.pub/
163154
build/
@@ -237,12 +228,17 @@ android/app/.cxx/
237228
**/ios/ServiceDefinitions.json
238229
**/ios/Runner/GeneratedPluginRegistrant.*
239230

231+
# ios/macos generated project files
240232
ios/Flutter/
241233
ios/Runner.xcodeproj/
242234
ios/Runner.xcworkspace/
243235
ios/Runner/
244236
ios/RunnerTests/
245237

238+
# Backups of ios/macos project config yml and Podfile
239+
ios/Podfile-*
240+
ios/project-*.yml
241+
246242
#-----------------------------------------------------------------------
247243
# macOS
248244
#-----------------------------------------------------------------------
@@ -253,6 +249,14 @@ ios/RunnerTests/
253249
**/macos/Flutter/ephemeral
254250
**/xcuserdata/
255251

252+
# ios/macos generated project files
253+
macos/Runner.xcodeproj/
254+
macos/Runner.xcworkspace/
255+
256+
# Backups of ios/macos project config yml and Podfile
257+
macos/Podfile-*
258+
macos/project-*.yml
259+
256260
#-----------------------------------------------------------------------
257261
# Windows
258262
#-----------------------------------------------------------------------

.lycheeignore

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# Lychee link checker ignore patterns
2+
# These URLs are expected to fail in CI but are valid in context
3+
4+
# Localhost OAuth callbacks used in integration tests
5+
6+
http://localhost:44007/
7+
8+
http://localhost:8000/
9+
10+
# POD OAuth endpoints that require authentication parameters
11+
12+
https://pods.dev.solidcommunity.au/.oidc/auth
13+
https://pods.dev.solidcommunity.au/.oidc/token
14+
15+
# Example POD URLs that are protected resources
16+
17+
https://pods.solidcommunity.au/my-moviestar/profile/card#me
18+
19+
# POD server base URL - has temporary availability issues.
20+
21+
https://pods.solidcommunity.au/
22+
23+
# ANU Software Innovation Institute website (frequent timeouts in CI)
24+
25+
https://sii.anu.edu.au/
26+
27+
# OpenStreetMap APIs - require User-Agent headers (400 Bad Request in CI)
28+
29+
https://nominatim.openstreetmap.org/reverse
30+
https://tile.openstreetmap.org/
31+
32+
# Map Tile Providers (Regex patterns) from geopod
33+
34+
https://tiles\.stadiamaps\.com/.*
35+
https://server\.arcgisonline\.com/.*
36+
https://.*\.basemaps\.cartocdn\.com/.*
37+
https://.*\.tile-cyclosm\.openstreetmap\.fr/.*
38+
39+
# Ignore the template index file.
40+
41+
web/**
42+
43+
# Licenses. Note that gnu.org is throttled so do not check it.
44+
45+
https://www.gnu.org/licenses/
46+
https://opensource.org/license/gpl-3-0
47+
48+
# Ontology definitions
49+
50+
http://xmlns.com/foaf/0.1/
51+
http://purl.org/dc/terms/
52+
https://solidcommunity.au/predicates/*

support/flutter.mk

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ flutter:
2525
emu Run with the android emulator;
2626
linux Run with the linux device;
2727
qlinux Run with the linux device and debugPrint() turned off;
28+
macos Run with the macos device;
2829

2930
prep Prep for PR by running tests, checks, docs.
3031
push Do a git push and bump the build number if there is one.
@@ -45,20 +46,25 @@ flutter:
4546
ignore Look for usage of ignore directives.
4647
license Look for missing top license in source code.
4748

48-
test Run flutter testing.
49-
itest Run flutter interation testing.
50-
qtest Run above test with PAUSE=0.
51-
coverage Run with `--coverage`.
52-
coview View the generated html coverage in browser.
49+
test Run flutter testing.
50+
itest Run flutter interation testing.
51+
qtest Run above test with PAUSE=0.
52+
qtest.all Run qtest with output redirected - good running all tests.
53+
coverage Run with `--coverage`.
54+
coview View the generated html coverage in browser.
5355

5456
riverpod Setup `pubspec.yaml` to support riverpod.
5557
runner Build the auto generated code as *.g.dart files.
5658

5759
desktops Set up for all desktop platforms (linux, windows, macos)
5860

5961
distributions
60-
apk Builds installers/$(APP).apk
61-
tgz Builds installers/$(APP).tar.gz
62+
apk Builds installers/$(APP).apk.
63+
tgz Builds installers/$(APP).tar.gz.
64+
dmg-unsigned Builds unsigned macos app.
65+
dmg-dev Builds macos app with development certificate.
66+
dmg-staging Builds macos app with distribution certificate.
67+
(TODO convert to dmg).
6268

6369
publish Publish a package to pub.dev
6470

@@ -106,22 +112,26 @@ chrome:
106112
pubspec.lock:
107113
flutter pub get
108114

115+
.PHONY: upgrade
116+
upgrade:
117+
flutter pub upgrade
118+
109119
.PHONY: linux
110-
linux: pubspec.lock $(BUILD_RUNNER)
120+
linux: pubspec.lock $(BUILD_RUNNER) upgrade
111121
flutter run --device-id linux
112122

113123
# Turn off debugPrint() output.
114124

115125
.PHONY: qlinux
116-
qlinux: pubspec.lock $(BUILD_RUNNER)
126+
qlinux: pubspec.lock $(BUILD_RUNNER) upgrade
117127
flutter run --dart-define DEBUG_PRINT="FALSE" --device-id linux
118128

119129
.PHONY: macos
120-
macos: $(BUILD_RUNNER)
130+
macos: $(BUILD_RUNNER) upgrade
121131
flutter run --device-id macos
122132

123133
.PHONY: android
124-
android: $(BUILD_RUNNER)
134+
android: $(BUILD_RUNNER) upgrade
125135
flutter run --device-id $(shell flutter devices | grep android | tr '•' '|' | tr -s '|' | tr -s ' ' | cut -d'|' -f2 | tr -d ' ')
126136

127137
.PHONY: emu
@@ -216,7 +226,7 @@ locmax:
216226
| egrep -v '^ *$$' \
217227
| egrep -v '^ *[)},]+, *$$' \
218228
| wc -l \
219-
| numfmt --grouping); \
229+
| numfmt --format "%'f"); \
220230
numf=$$(find lib -name "*.dart" -type f | wc -l); \
221231
output=$$(find lib -name "*.dart" -exec sh -c ' \
222232
lines=$$(bash $(LOC) "$$1"); \
@@ -455,6 +465,25 @@ realclean::
455465
flutter clean
456466
flutter pub get
457467

468+
# Create a macos app
469+
# [20251029 jesscmoore] TODO: add converting to dmg
470+
# Build unsigned macos app
471+
dmg-unsigned::
472+
flutter clean
473+
flutter build macos --release --flavor unsigned
474+
475+
# Build macos app signed with development certificate for testing
476+
# by App Developer Program togaware registered devices
477+
dmg-dev::
478+
flutter clean
479+
flutter build macos --release --flavor dev
480+
481+
# Build macos app signed with app store distribution for testing
482+
# on Testflight or publishing
483+
dmg-staging:
484+
flutter clean
485+
flutter build macos --release --flavor staging
486+
458487
# For the `dev` branch only, update the version sequence number prior
459488
# to a push (relies on the git.mk being loaded after this
460489
# flutter.mk). This is only undertaken through `make push` rather than

0 commit comments

Comments
 (0)