From 7ae7dc497ba9ea115319155fd07e6f1bd2b91f6c Mon Sep 17 00:00:00 2001 From: MikeWallaceDev Date: Thu, 7 Jul 2022 20:30:58 -0400 Subject: [PATCH 1/3] fix: fix linux build on x86_64 --- frontend/Makefile.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/Makefile.toml b/frontend/Makefile.toml index 8418c30141..337b9efd76 100644 --- a/frontend/Makefile.toml +++ b/frontend/Makefile.toml @@ -100,7 +100,7 @@ CRATE_TYPE = "cdylib" SDK_EXT = "dll" APP_ENVIRONMENT = "production" -[env.development-linux-x86] +[env.development-linux-x86_64] TARGET_OS = "linux" RUST_COMPILE_TARGET = "x86_64-unknown-linux-gnu" BUILD_FLAG = "debug" @@ -109,7 +109,7 @@ FLUTTER_OUTPUT_DIR = "Debug" SDK_EXT = "so" LINUX_ARCH = "x64" -[env.production-linux-x86] +[env.production-linux-x86_64] BUILD_FLAG = "release" TARGET_OS = "linux" RUST_COMPILE_TARGET = "x86_64-unknown-linux-gnu" From c0414a0e7e553b4864f3e490db867f4b048426c8 Mon Sep 17 00:00:00 2001 From: MikeWallaceDev Date: Fri, 8 Jul 2022 10:53:29 -0400 Subject: [PATCH 2/3] fix: fixed the ci script to correctly use 86_64 --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d3dd050e2c..dbbd729c81 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ jobs: os: [ubuntu-latest, macos-latest] include: - os: ubuntu-latest - flutter_profile: development-linux-x86 + flutter_profile: development-linux-x86_64 - os: macos-latest flutter_profile: development-mac-x86_64 runs-on: ${{ matrix.os }} @@ -82,4 +82,4 @@ jobs: - name: Build working-directory: frontend run: | - cargo make --profile ${{ matrix.flutter_profile }} appflowy-dev \ No newline at end of file + cargo make --profile ${{ matrix.flutter_profile }} appflowy-dev From 3aca5a3b46958d1f1c14737bdf4f9d8eb756999e Mon Sep 17 00:00:00 2001 From: MikeWallaceDev Date: Fri, 8 Jul 2022 11:20:42 -0400 Subject: [PATCH 3/3] fix: continue adding "_64" to make build work --- .github/workflows/dart_lint.yml | 2 +- .github/workflows/dart_test.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/rust_lint.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dart_lint.yml b/.github/workflows/dart_lint.yml index 65f78f80cd..eb5703cd72 100644 --- a/.github/workflows/dart_lint.yml +++ b/.github/workflows/dart_lint.yml @@ -42,7 +42,7 @@ jobs: - name: Build FlowySDK working-directory: frontend run: | - cargo make --profile development-linux-x86 flowy-sdk-dev + cargo make --profile development-linux-x86_64 flowy-sdk-dev - name: Code Generation working-directory: frontend/app_flowy diff --git a/.github/workflows/dart_test.yml b/.github/workflows/dart_test.yml index 0689345b68..74b20a2425 100644 --- a/.github/workflows/dart_test.yml +++ b/.github/workflows/dart_test.yml @@ -56,7 +56,7 @@ jobs: - name: Build FlowySDK working-directory: frontend run: | - cargo make --profile development-linux-x86 flowy-sdk-dev + cargo make --profile development-linux-x86_64 flowy-sdk-dev - name: Code Generation working-directory: frontend/app_flowy diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a2c9c7b133..f574b63137 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,7 +67,7 @@ jobs: working-directory: frontend run: | flutter config --enable-linux-desktop - cargo make --env APP_VERSION=${{ github.ref_name }} --profile production-linux-x86 appflowy + cargo make --env APP_VERSION=${{ github.ref_name }} --profile production-linux-x86_64 appflowy - name: Upload Release Asset id: upload-release-asset diff --git a/.github/workflows/rust_lint.yml b/.github/workflows/rust_lint.yml index 543f7f5b2e..4f364a616a 100644 --- a/.github/workflows/rust_lint.yml +++ b/.github/workflows/rust_lint.yml @@ -30,7 +30,7 @@ jobs: - name: Build FlowySDK working-directory: frontend run: | - cargo make --profile development-linux-x86 flowy-sdk-dev + cargo make --profile development-linux-x86_64 flowy-sdk-dev - run: rustup component add rustfmt working-directory: frontend/rust-lib