Skip to content

Commit

Permalink
CI updates
Browse files Browse the repository at this point in the history
  • Loading branch information
atavism committed Oct 30, 2024
1 parent d42db5a commit d7b2f18
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ jobs:
with:
go-version-file: "go.mod"

- name: Granting private modules access
run: git config --global url."https://${{ secrets.GH_TOKEN }}:[email protected]/".insteadOf "https://github.com/"

- name: Install WebView2 Runtime
if: matrix.platform == 'windows'
shell: pwsh
Expand Down
15 changes: 9 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,8 @@ $(ANDROID_LIB): $(GO_SOURCES)
$(MOBILE_ANDROID_LIB): $(ANDROID_LIB)
mkdir -p $(MOBILE_LIBS) && cp $(ANDROID_LIB) $(MOBILE_ANDROID_LIB)

.PHONY: android-lib appium-test-build
android-lib: $(MOBILE_ANDROID_LIB)
.PHONY: android appium-test-build
android: $(MOBILE_ANDROID_LIB)

appium-test-build:
flutter build apk --flavor=appiumTest --dart-define=app.flavor=appiumTest --debug
Expand Down Expand Up @@ -503,12 +503,14 @@ linux-arm64: export GO_BUILD_FLAGS += -a -buildmode=c-shared
linux-arm64: export Environment = production
linux-arm64: desktop-lib ## Build lantern for linux-arm64

linux: linux-amd64

.PHONY: package-linux
package-linux:
flutter_distributor package --skip-clean --platform linux --targets "deb,rpm" --flutter-build-args=verbose

.PHONY: windows
windows: $(WINDOWS_LIB_NAME) ## Build lantern for windows
.PHONY: windows-386
windows-386: $(WINDOWS_LIB_NAME)
$(WINDOWS_LIB_NAME): export CXX = i686-w64-mingw32-g++
$(WINDOWS_LIB_NAME): export CC = i686-w64-mingw32-gcc
$(WINDOWS_LIB_NAME): export CGO_LDFLAGS = -static
Expand All @@ -522,8 +524,8 @@ $(WINDOWS_LIB_NAME): export BUILD_RACE =
$(WINDOWS_LIB_NAME): export Environment = production
$(WINDOWS_LIB_NAME): desktop-lib

.PHONY: windows64
windows64: $(WINDOWS64_LIB_NAME) ## Build lantern for windows
.PHONY: windows
windows: $(WINDOWS64_LIB_NAME)
$(WINDOWS64_LIB_NAME): export CXX = x86_64-w64-mingw32-g++
$(WINDOWS64_LIB_NAME): export CC = x86_64-w64-mingw32-gcc
$(WINDOWS64_LIB_NAME): export CGO_LDFLAGS = -static
Expand All @@ -535,6 +537,7 @@ $(WINDOWS64_LIB_NAME): export EXTRA_LDFLAGS +=
$(WINDOWS64_LIB_NAME): export GO_BUILD_FLAGS += -a -buildmode=c-shared
$(WINDOWS64_LIB_NAME): export BUILD_RACE =
$(WINDOWS64_LIB_NAME): desktop-lib
$(WINDOWS64_LIB_NAME): mkdir -p build/windows/x64/runner/Release

## APP_VERSION is the version defined in pubspec.yaml
APP_VERSION := $(shell grep '^version:' pubspec.yaml | sed 's/version: //')
Expand Down

0 comments on commit d7b2f18

Please sign in to comment.