Skip to content

Commit

Permalink
merge latest
Browse files Browse the repository at this point in the history
  • Loading branch information
atavism committed Jan 17, 2025
2 parents 89f16e8 + 0b0637f commit 0bae1e6
Show file tree
Hide file tree
Showing 42 changed files with 623 additions and 539 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/prerelease-notification.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
name: Prerelease Notification

on:
workflow_run:
workflows: [ "release" ]
types:
- success
workflow_dispatch:
push:
tags:
- 'lantern-[0-9]+.[0-9]+.[0-9]+-**'

jobs:
create-release:
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
echo "Platform determined: android"
echo "platform=android" >> "$GITHUB_OUTPUT"
elif [[ $TAG == desktop-* ]]; then
echo "Platform determined: macos"
echo "Platform determined: desktop"
echo "platform=desktop" >> "$GITHUB_OUTPUT"
else
echo "Platform determined: all (tag did not match specific platforms)"
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:

push-binaries:
runs-on: ubuntu-latest
needs: [ set-version, build ]
needs: [ determine-platform,set-version, build ]
env:
version: ${{ needs.set-version.outputs.version }}
prefix: ${{ needs.set-version.outputs.prefix }}
Expand Down Expand Up @@ -166,6 +166,7 @@ jobs:
with:
name: mapping.txt


- name: Upload Lantern to TestFlight
uses: apple-actions/upload-testflight-build@v1
if: (needs.set-version.outputs.prefix == 'lantern-installer-preview'|| needs.set-version.outputs.prefix == 'lantern-installer') && (needs.determine-platform.outputs.platform == 'ios' || needs.determine-platform.outputs.platform == 'all')
Expand Down Expand Up @@ -194,8 +195,8 @@ jobs:
packageName: org.getlantern.lantern
releaseFiles: lantern-installer.aab
track: production
debugSymbols: ${{ github.workspace }}/build/outputs/debug-symbols/debug-symbols.zip
mappingFile: ${{ github.workspace }}/build/app/outputs/mapping/prodPlay/mapping.txt
debugSymbols: debug-symbols.zip
mappingFile: mapping.txt

- name: Grant private modules access
run: git config --global url."https://${{ secrets.CI_PRIVATE_REPOS_GH_TOKEN }}:[email protected]/".insteadOf "https://github.com/"
Expand Down
7 changes: 7 additions & 0 deletions .run/macos.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="macos" type="FlutterRunConfigurationType" factoryName="Flutter">
<option name="additionalArgs" value="-d macOS" />
<option name="filePath" value="$PROJECT_DIR$/lib/main.dart" />
<method v="2" />
</configuration>
</component>
7 changes: 7 additions & 0 deletions .run/windows.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="windows" type="FlutterRunConfigurationType" factoryName="Flutter">
<option name="additionalArgs" value="-d windows" />
<option name="filePath" value="$PROJECT_DIR$/lib/main.dart" />
<method v="2" />
</configuration>
</component>
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ DEBUG_VERSION ?= $(GIT_REVISION)

DWARF_DSYM_FOLDER_PATH=$(shell pwd)/build/ios/archive/Runner.xcarchive/dSYMs/
INFO_PLIST := ios/Runner/Info.plist
ENTITLEMENTS := macos/Runner/Release.entitlements

DESKTOP_LIB_NAME ?= liblantern
DARWIN_LIB_NAME ?= $(DESKTOP_LIB_NAME).dylib
Expand Down Expand Up @@ -243,7 +244,7 @@ tag: require-version
git push

define osxcodesign
codesign --options runtime --strict --timestamp --force --deep -s "Developer ID Application: Brave New Software Project, Inc (ACZRKC3LQ9)" -v $(1)
codesign --options runtime --strict --timestamp --force --entitlements $(ENTITLEMENTS) --deep -s "Developer ID Application: Brave New Software Project, Inc (ACZRKC3LQ9)" -v $(1)
endef

guard-%:
Expand Down Expand Up @@ -346,7 +347,7 @@ release: require-version require-s3cmd require-wget require-lantern-binaries req

$(ANDROID_LIB): $(GO_SOURCES)
go env -w 'GOPRIVATE=github.com/getlantern/*' && \
go install golang.org/x/mobile/cmd/gomobile && \
go install golang.org/x/mobile/cmd/gomobile@latest && \
gomobile init && \
gomobile bind \
-target=$(ANDROID_ARCH_GOMOBILE) \
Expand Down
13 changes: 0 additions & 13 deletions android/.settings/org.eclipse.buildship.core.prefs

This file was deleted.

Loading

0 comments on commit 0bae1e6

Please sign in to comment.