From bb00f49caa8189bcbcc7a192e3c2414a72a72106 Mon Sep 17 00:00:00 2001 From: Paul Sajna Date: Thu, 18 Apr 2024 17:49:30 +0000 Subject: [PATCH 01/10] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4476fbd..9832fad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,7 +51,8 @@ build_linux_amd64_bundle: artifacts: paths: - build/linux/x64/release/bundle/ - when: manual + only: + - schedules build_linux_amd64_flatpak: tags: @@ -71,7 +72,9 @@ build_linux_amd64_flatpak: artifacts: paths: - flatpak/com.veilid.veilidchat.flatpak - when: manual + needs: + - job: build_linux_amd64_bundle + artifacts: true #test: # extends: From fa738eb312be1bf0ed22856ab6b7cdbaf60df0c5 Mon Sep 17 00:00:00 2001 From: Paul Sajna Date: Thu, 18 Apr 2024 18:16:30 +0000 Subject: [PATCH 02/10] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9832fad..f8b8788 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,9 +2,9 @@ # HOMEBREW_NO_AUTO_UPDATE: 1 stages: - - build - - build_flatpak -# - test + - build_macos + - build_linux_amd64_bundle + - build_linux_amd64_flatpak .macos_saas_runners: tags: @@ -16,7 +16,7 @@ stages: build_macos: extends: - .macos_saas_runners - stage: build + stage: build_macos script: - echo "place holder for build" - sudo softwareupdate --install-rosetta --agree-to-license @@ -35,13 +35,14 @@ build_macos: - flutter doctor -v #- flutter build ipa #- flutter build appbundle - when: manual + only: + - schedules build_linux_amd64_bundle: + stage: build_linux_amd64_bundle tags: - saas-linux-medium-amd64 image: ghcr.io/cirruslabs/flutter:3.19.4 - stage: build script: - apt-get update - apt-get install -y --no-install-recommends cmake ninja-build clang build-essential pkg-config libgtk-3-dev liblzma-dev lcov rustc cargo @@ -58,7 +59,7 @@ build_linux_amd64_flatpak: tags: - saas-linux-small-amd64 image: ubuntu:23.04 - stage: build_flatpak + stage: build_linux_amd64_flatpak dependencies: [build_linux_amd64_bundle] script: - apt-get update @@ -70,12 +71,10 @@ build_linux_amd64_flatpak: - flatpak build-bundle repo com.veilid.veilidchat.flatpak com.veilid.veilidchat - popd artifacts: - paths: + paths: - flatpak/com.veilid.veilidchat.flatpak - needs: - - job: build_linux_amd64_bundle - artifacts: true - + only: + - schedules #test: # extends: # - .macos_saas_runners From 99f14c0e4410a6745f399d561834e67bf4fd0645 Mon Sep 17 00:00:00 2001 From: Paul Sajna Date: Thu, 18 Apr 2024 18:21:34 +0000 Subject: [PATCH 03/10] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8b8788..c496043 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,9 +2,7 @@ # HOMEBREW_NO_AUTO_UPDATE: 1 stages: - - build_macos - - build_linux_amd64_bundle - - build_linux_amd64_flatpak + - build .macos_saas_runners: tags: @@ -16,7 +14,7 @@ stages: build_macos: extends: - .macos_saas_runners - stage: build_macos + stage: build script: - echo "place holder for build" - sudo softwareupdate --install-rosetta --agree-to-license @@ -39,7 +37,7 @@ build_macos: - schedules build_linux_amd64_bundle: - stage: build_linux_amd64_bundle + stage: build tags: - saas-linux-medium-amd64 image: ghcr.io/cirruslabs/flutter:3.19.4 @@ -59,8 +57,11 @@ build_linux_amd64_flatpak: tags: - saas-linux-small-amd64 image: ubuntu:23.04 - stage: build_linux_amd64_flatpak + stage: build dependencies: [build_linux_amd64_bundle] + needs: + - job: build_linux_amd64_bundle + artifacts: true script: - apt-get update - apt-get install -y --no-install-recommends flatpak flatpak-builder gnupg2 elfutils ca-certificates From 7db21c2a885c846c7a0aa5a5bbfa422504055e12 Mon Sep 17 00:00:00 2001 From: Paul Sajna Date: Thu, 18 Apr 2024 18:34:49 +0000 Subject: [PATCH 04/10] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c496043..39db3a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,8 +33,6 @@ build_macos: - flutter doctor -v #- flutter build ipa #- flutter build appbundle - only: - - schedules build_linux_amd64_bundle: stage: build @@ -50,8 +48,6 @@ build_linux_amd64_bundle: artifacts: paths: - build/linux/x64/release/bundle/ - only: - - schedules build_linux_amd64_flatpak: tags: @@ -74,8 +70,6 @@ build_linux_amd64_flatpak: artifacts: paths: - flatpak/com.veilid.veilidchat.flatpak - only: - - schedules #test: # extends: # - .macos_saas_runners From d6ed3a72b043f22c29f86d28443c3b2bacc84254 Mon Sep 17 00:00:00 2001 From: Paul Sajna Date: Thu, 18 Apr 2024 11:40:34 -0700 Subject: [PATCH 05/10] Revert "Update .gitlab-ci.yml" This reverts commit 7db21c2a885c846c7a0aa5a5bbfa422504055e12. --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39db3a6..c496043 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,8 @@ build_macos: - flutter doctor -v #- flutter build ipa #- flutter build appbundle + only: + - schedules build_linux_amd64_bundle: stage: build @@ -48,6 +50,8 @@ build_linux_amd64_bundle: artifacts: paths: - build/linux/x64/release/bundle/ + only: + - schedules build_linux_amd64_flatpak: tags: @@ -70,6 +74,8 @@ build_linux_amd64_flatpak: artifacts: paths: - flatpak/com.veilid.veilidchat.flatpak + only: + - schedules #test: # extends: # - .macos_saas_runners From 04df055b9b4d3ba5508ad421f958f3ec63a37c42 Mon Sep 17 00:00:00 2001 From: Paul Sajna Date: Sun, 21 Jul 2024 08:45:51 +0000 Subject: [PATCH 06/10] Update flutter to 3.22.1 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c496043..8c8615b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,7 @@ build_linux_amd64_bundle: stage: build tags: - saas-linux-medium-amd64 - image: ghcr.io/cirruslabs/flutter:3.19.4 + image: ghcr.io/cirruslabs/flutter:3.22.1 script: - apt-get update - apt-get install -y --no-install-recommends cmake ninja-build clang build-essential pkg-config libgtk-3-dev liblzma-dev lcov rustc cargo From 2e819845c7514bc4ec15f5388da6d9becf7dfade Mon Sep 17 00:00:00 2001 From: Paul Sajna Date: Sun, 21 Jul 2024 09:07:29 +0000 Subject: [PATCH 07/10] Update gnome platform to 46 --- flatpak/com.veilid.veilidchat.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flatpak/com.veilid.veilidchat.yml b/flatpak/com.veilid.veilidchat.yml index af45e4b..3db5a02 100644 --- a/flatpak/com.veilid.veilidchat.yml +++ b/flatpak/com.veilid.veilidchat.yml @@ -3,7 +3,7 @@ --- app-id: com.veilid.veilidchat runtime: org.gnome.Platform -runtime-version: "45" +runtime-version: "46" sdk: org.gnome.Sdk command: veilidchat separate-locales: false From c00faf57483d18f380cdddbe3eead00f93fafbd6 Mon Sep 17 00:00:00 2001 From: Paul Sajna Date: Sun, 21 Jul 2024 09:10:08 +0000 Subject: [PATCH 08/10] Update ubuntu to 24.04 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8c8615b..a5f806a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,7 +56,7 @@ build_linux_amd64_bundle: build_linux_amd64_flatpak: tags: - saas-linux-small-amd64 - image: ubuntu:23.04 + image: ubuntu:24.04 stage: build dependencies: [build_linux_amd64_bundle] needs: @@ -66,7 +66,7 @@ build_linux_amd64_flatpak: - apt-get update - apt-get install -y --no-install-recommends flatpak flatpak-builder gnupg2 elfutils ca-certificates - flatpak remote-add --no-gpg-verify --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - - flatpak install -y --noninteractive org.gnome.Sdk/x86_64/45 org.gnome.Platform/x86_64/45 app/org.flathub.flatpak-external-data-checker/x86_64/stable org.freedesktop.appstream-glib + - flatpak install -y --noninteractive org.gnome.Sdk/x86_64/46 org.gnome.Platform/x86_64/46 app/org.flathub.flatpak-external-data-checker/x86_64/stable org.freedesktop.appstream-glib - pushd flatpak/ - flatpak-builder --force-clean build-dir com.veilid.veilidchat.yml --repo=repo - flatpak build-bundle repo com.veilid.veilidchat.flatpak com.veilid.veilidchat From 4b4ee601f5511965358d89b513c53c30724560b0 Mon Sep 17 00:00:00 2001 From: Paul Sajna Date: Thu, 8 Aug 2024 22:12:02 +0000 Subject: [PATCH 09/10] comment out macos ci that breaks my side --- .gitlab-ci.yml | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a5f806a..3ac02c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,37 +4,37 @@ stages: - build -.macos_saas_runners: - tags: - - saas-macos-medium-m1 - image: macos-12-xcode-14 - before_script: - - echo "started by ${GITLAB_USER_NAME}" +#.macos_saas_runners: +# tags: +# - saas-macos-medium-m1 +# image: macos-12-xcode-14 +# before_script: +# - echo "started by ${GITLAB_USER_NAME}" -build_macos: - extends: - - .macos_saas_runners - stage: build - script: - - echo "place holder for build" - - sudo softwareupdate --install-rosetta --agree-to-license - - git clone https://gitlab.com/veilid/veilid.git ../veilid +#build_macos: +# extends: +# - .macos_saas_runners +# stage: build +# script: +# - echo "place holder for build" +# - sudo softwareupdate --install-rosetta --agree-to-license +# - git clone https://gitlab.com/veilid/veilid.git ../veilid #- curl –proto ‘=https’ –tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y #- source "$HOME/.cargo/env" #- brew install capnp cmake wabt llvm protobuf openjdk@17 jq cocoapods #- cargo install wasm-bindgen-cli wasm-pack cargo-edit - - wget https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_arm64_3.13.5-stable.zip - - unzip flutter_macos_arm64_3.13.5-stable.zip && export PATH="$PATH:`pwd`/flutter/bin" - - flutter upgrade - - yes | flutter doctor --android-licenses - - flutter config --enable-macos-desktop --enable-ios - - flutter config --no-analytics - - dart --disable-analytics - - flutter doctor -v +# - wget https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_arm64_3.13.5-stable.zip +# - unzip flutter_macos_arm64_3.13.5-stable.zip && export PATH="$PATH:`pwd`/flutter/bin" +# - flutter upgrade +# - yes | flutter doctor --android-licenses +# - flutter config --enable-macos-desktop --enable-ios +# - flutter config --no-analytics +# - dart --disable-analytics +# - flutter doctor -v #- flutter build ipa #- flutter build appbundle - only: - - schedules +# only: +# - schedules build_linux_amd64_bundle: stage: build From c406f3084966814ef9adcb28dd5ad16b99bdaaae Mon Sep 17 00:00:00 2001 From: Paul Sajna Date: Sun, 30 Mar 2025 20:09:54 +0000 Subject: [PATCH 10/10] Update .gitlab-ci.yml file Edit .gitlab-ci.yml Update .gitlab-ci.yml file Update .gitlab-ci.yml file Update .gitlab-ci.yml file Update .gitlab-ci.yml file Update .gitlab-ci.yml file Update .gitlab-ci.yml file Update .gitlab-ci.yml file Update .gitlab-ci.yml file Update .gitlab-ci.yml file Edit .gitlab-ci.yml Update .gitlab-ci.yml file Update .gitlab-ci.yml file Update .gitlab-ci.yml file --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ac02c3..72e4576 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,10 +40,11 @@ build_linux_amd64_bundle: stage: build tags: - saas-linux-medium-amd64 - image: ghcr.io/cirruslabs/flutter:3.22.1 + image: ghcr.io/cirruslabs/flutter:3.29.2 script: - apt-get update - - apt-get install -y --no-install-recommends cmake ninja-build clang build-essential pkg-config libgtk-3-dev liblzma-dev lcov rustc cargo + - apt-get install -y --no-install-recommends cmake ninja-build clang build-essential pkg-config libgtk-3-dev liblzma-dev lcov rustup + - rustup toolchain install 1.81 --profile minimal --no-self-update - flutter config --enable-linux-desktop - git clone https://gitlab.com/veilid/veilid.git ../veilid - flutter build linux