Skip to content

Commit 7266a75

Browse files
authored
[MOB-9322] Merge Release CI Jobs Together (#282)
* Merge GH and Pub Release Jobs * Delete `release.sh`
1 parent dfd7e52 commit 7266a75

File tree

2 files changed

+25
-54
lines changed

2 files changed

+25
-54
lines changed

.circleci/config.yml

Lines changed: 25 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -118,25 +118,33 @@ jobs:
118118
command: flutter pub run pana --no-warning --exit-code-threshold 0
119119
- run: flutter pub publish --dry-run
120120

121-
pub_release:
122-
docker:
123-
- image: cirrusci/flutter
124-
steps:
125-
- checkout
126-
- run: chmod +x ./release.sh
127-
- run: ./release.sh
128-
129-
gh_ibg_release:
121+
release:
130122
macos:
131-
xcode: "13.4.1"
123+
xcode: 13.4.1
132124
working_directory: "~"
133125
steps:
134126
- checkout:
135127
path: ~/project
136-
- run: git clone https://InstabugCI:[email protected]/Instabug/Escape.git
137-
- run: cd Escape && swift build -c release
138-
- run: cd Escape/.build/release && cp -f Escape /usr/local/bin/escape
139-
- run: cd project && Escape flutter publish
128+
- flutter/install_sdk_and_pub:
129+
flutter_version: 3.3.6
130+
app-dir: project
131+
- run:
132+
name: Generate Pigeons
133+
working_directory: project
134+
command: sh ./scripts/pigeon.sh
135+
- run:
136+
name: Clone Escape
137+
command: git clone [email protected]:Instabug/Escape.git
138+
- run:
139+
name: Build Escape
140+
working_directory: Escape
141+
command: |
142+
swift build -c release
143+
cp -f .build/release/Escape /usr/local/bin/escape
144+
- run:
145+
name: Publish Package
146+
working_directory: project
147+
command: Escape flutter publish
140148

141149
workflows:
142150
version: 2
@@ -153,24 +161,7 @@ workflows:
153161
- verify_pub:
154162
requires:
155163
- lint_flutter
156-
- hold_pub_release:
157-
type: approval
158-
requires:
159-
- flutter_tests
160-
- flutter_tests_2-10-5
161-
- test_android
162-
- ios_tests
163-
- verify_pub
164-
filters:
165-
branches:
166-
only: master
167-
- pub_release:
168-
requires:
169-
- hold_pub_release
170-
filters:
171-
branches:
172-
only: master
173-
- hold_gh_ibg_release:
164+
- hold_release:
174165
type: approval
175166
requires:
176167
- flutter_tests
@@ -181,9 +172,9 @@ workflows:
181172
filters:
182173
branches:
183174
only: master
184-
- gh_ibg_release:
175+
- release:
185176
requires:
186-
- hold_gh_ibg_release
177+
- hold_release
187178
filters:
188179
branches:
189180
only: master

release.sh

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)