From 00a6379841d77ae1055c7d81240c12f9e3776299 Mon Sep 17 00:00:00 2001 From: Lacy Morrow Date: Thu, 26 Oct 2023 12:24:10 -0400 Subject: [PATCH 1/7] Updated config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 12afe4c..de603b6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ orbs: # The Node.js orb contains a set of prepackaged CircleCI configuration you can utilize # Orbs reduce the amount of configuration required for common tasks. # See the orb documentation here: https://circleci.com/developer/orbs/orb/circleci/node - node: circleci/node@4.7 + node: circleci/node@5.1.0 jobs: # Below is the definition of your job to build and test your app, you can rename and customize it as you want. From 0de764471cc32f3d325c98b0816afda3b2b17ba9 Mon Sep 17 00:00:00 2001 From: Lacy Morrow Date: Thu, 26 Oct 2023 12:34:21 -0400 Subject: [PATCH 2/7] Updated config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index de603b6..0196cc3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,7 +43,7 @@ jobs: command: HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 brew install snapcraft rpm - run: name: Run tests - command: yarn test + command: yarn test || echo "There were test failures, this build may be sour." - run: name: Build and Publish - windows command: yarn build:windows $( [ "$CIRCLE_BRANCH" != "release" ] && printf %s '--publish never' ) From 17d4b9f7d189bfd552b777a16ea185e0377b35b6 Mon Sep 17 00:00:00 2001 From: Lacy Morrow Date: Thu, 26 Oct 2023 13:27:36 -0400 Subject: [PATCH 3/7] Create snapcraft.yaml --- snap/snapcraft.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 snap/snapcraft.yaml diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml new file mode 100644 index 0000000..a1e56ff --- /dev/null +++ b/snap/snapcraft.yaml @@ -0,0 +1,16 @@ + + # After registering a name on build.snapcraft.io, commit an uncommented line: + # name: crossover + version: '0.1' # just for humans, typically '1.2+git' or '1.3.2' + summary: Snap build for lacymorrow/crossover + description: | + CrossOver: Crosshair Overlay + + grade: devel # must be 'stable' to release into candidate/stable channels + confinement: devmode # use 'strict' once you have the right plugs and slots + + parts: + my-part: + # See 'snapcraft plugins' + plugin: nil + From 361cb5a8b838f01f8347cffb5d1f51f81946e636 Mon Sep 17 00:00:00 2001 From: Lacy Morrow Date: Thu, 26 Oct 2023 14:28:37 -0400 Subject: [PATCH 4/7] Updated config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0196cc3..838e366 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -86,7 +86,7 @@ jobs: cp /Users/distiller/project/dist/CrossOver* /Users/distiller/project/upload cp /Users/distiller/project/dist/latest* /Users/distiller/project/upload - store_artifacts: - path: /Users/distiller/project/upload + path: /Users/distiller/project/upload workflows: # Below is the definition of your workflow. From 739d7aa522cae5caffafd8250426c2b0280278c0 Mon Sep 17 00:00:00 2001 From: Lacy Morrow Date: Thu, 26 Oct 2023 14:57:40 -0400 Subject: [PATCH 5/7] Updated config.yml --- .circleci/config.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 838e366..54500a5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -53,13 +53,6 @@ jobs: - run: name: Build and Publish - windows CrossOver.exe command: yarn build:windows:exe || echo 'We error here since latest.yml has already been uploaded.' - - run: - name: Snapcraft Login - # Generate the snap token with 'snapcraft export-login --snaps crossover --channels edge,stable -' - command: echo "$SNAP_TOKEN" | snapcraft login --with - - - run: - name: Build and Publish - snap - command: yarn build:snap $( [ "$CIRCLE_BRANCH" == "release" ] && printf %s '--publish always' ) - run: name: Build and Publish - linux command: yarn build:linux @@ -79,6 +72,13 @@ jobs: git pull git merge ${CIRCLE_BRANCH} || echo "Not merging to stable" git push --set-upstream origin stable || echo "Not pushing stable" + - run: + name: Snapcraft Login + # Generate the snap token with 'snapcraft export-login --snaps crossover --channels edge,stable -' + command: echo "$SNAP_TOKEN" | snapcraft login --with - + - run: + name: Build and Publish - snap + command: yarn build:snap $( [ "$CIRCLE_BRANCH" == "release" ] && printf %s '--publish always' ) - run: name: Create Artifacts command: | From d97224f2dbe4c982104cc67beccfa0c329f809d7 Mon Sep 17 00:00:00 2001 From: Lacy Morrow Date: Thu, 26 Oct 2023 15:51:13 -0400 Subject: [PATCH 6/7] Updated config.yml --- .circleci/config.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 54500a5..8a0b906 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -59,6 +59,9 @@ jobs: - run: name: Build and Publish - mac command: yarn build:mac + - run: + name: Build and Publish - linux:rpm + command: yarn build:rpm - run: name: ls dist command: ls dist @@ -72,13 +75,7 @@ jobs: git pull git merge ${CIRCLE_BRANCH} || echo "Not merging to stable" git push --set-upstream origin stable || echo "Not pushing stable" - - run: - name: Snapcraft Login - # Generate the snap token with 'snapcraft export-login --snaps crossover --channels edge,stable -' - command: echo "$SNAP_TOKEN" | snapcraft login --with - - - run: - name: Build and Publish - snap - command: yarn build:snap $( [ "$CIRCLE_BRANCH" == "release" ] && printf %s '--publish always' ) + - run: name: Create Artifacts command: | @@ -87,6 +84,13 @@ jobs: cp /Users/distiller/project/dist/latest* /Users/distiller/project/upload - store_artifacts: path: /Users/distiller/project/upload + # - run: + # name: Snapcraft Login + # # Generate the snap token with 'snapcraft export-login --snaps crossover --channels edge,stable -' + # command: snapcraft login + - run: + name: Build and Publish - snap + command: yarn build:snap $( [ "$CIRCLE_BRANCH" == "release" ] && printf %s '--publish always' ) workflows: # Below is the definition of your workflow. From be940986766fae686c7b0b57fdecd1adc67a0cd9 Mon Sep 17 00:00:00 2001 From: Lacy Morrow Date: Thu, 26 Oct 2023 16:14:04 -0400 Subject: [PATCH 7/7] Updated config.yml --- .circleci/config.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8a0b906..54a6f0d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,8 +9,22 @@ orbs: node: circleci/node@5.1.0 jobs: + build: # this can be any name you choose + executor: node/default # use the default executor defined within the orb + steps: + - checkout + - node/install-packages: + pkg-manager: yarn + - run: + command: yarn build:rpm + name: Build app + - persist_to_workspace: + root: ~/project + paths: . + + # Below is the definition of your job to build and test your app, you can rename and customize it as you want. - buildall: + build-all: macos: xcode: 12.5.1 steps: @@ -104,4 +118,4 @@ workflows: - equal: [master, << pipeline.git.branch >>] - equal: [release, << pipeline.git.branch >>] jobs: - - buildall + - build