Skip to content

Commit f2b09e6

Browse files
authored
Merge pull request #81 from tinybirdco/400
remove semver
2 parents 5583c5d + fedd51d commit f2b09e6

File tree

5 files changed

+14
-19
lines changed

5 files changed

+14
-19
lines changed

.github/workflows/cd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ jobs:
7070
- name: Deploy changes to the main Workspace
7171
run: |
7272
DEPLOY_FILE=./deploy/${VERSION}/deploy.sh
73-
if [ ! -f "$DEPLOY_FILE" ] && [ "$VERSION" != "0.0.0" ]; then
73+
if [ ! -f "$DEPLOY_FILE" ]; then
7474
echo "$DEPLOY_FILE not found, running default tb deploy command"
75-
tb --semver ${VERSION} deploy ${CD_FLAGS}
75+
tb deploy ${CD_FLAGS}
7676
tb release ls
7777
fi
7878

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jobs:
144144
DEPLOY_FILE=./deploy/${VERSION}/deploy.sh
145145
if [ ! -f "$DEPLOY_FILE" ]; then
146146
echo "$DEPLOY_FILE not found, running default tb deploy command"
147-
tb --semver ${VERSION} deploy ${CI_FLAGS}
147+
tb deploy ${CI_FLAGS}
148148
tb release ls
149149
fi
150150
@@ -264,18 +264,18 @@ jobs:
264264
run: |
265265
if [ -f ./scripts/append_fixtures.sh ]; then
266266
echo "append_fixtures script found"
267-
./scripts/append_fixtures.sh $VERSION
267+
./scripts/append_fixtures.sh
268268
fi
269269
270270
- name: Run fixture tests
271271
run: |
272272
if [ -f ./scripts/exec_test.sh ]; then
273-
./scripts/exec_test.sh $VERSION
273+
./scripts/exec_test.sh
274274
fi
275275
276276
- name: Run data quality tests
277277
run: |
278-
tb --semver $VERSION test run -v -c 4
278+
tb test run -v -c 4
279279
280280
cleanup:
281281
runs-on: ubuntu-latest

.gitlab/ci_cd.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ variables:
8181
DEPLOY_FILE=./deploy/${VERSION}/deploy.sh
8282
if [ ! -f "$DEPLOY_FILE" ]; then
8383
echo "$DEPLOY_FILE not found, running default tb deploy command"
84-
tb --semver ${VERSION} deploy ${CI_FLAGS}
84+
tb deploy ${CI_FLAGS}
8585
tb release ls
8686
fi
8787
@@ -177,16 +177,16 @@ variables:
177177
- |
178178
if [ -f ./scripts/append_fixtures.sh ]; then
179179
echo "append_fixtures script found"
180-
./scripts/append_fixtures.sh $VERSION
180+
./scripts/append_fixtures.sh
181181
fi
182182
183183
- |
184184
if [ -f ./scripts/exec_test.sh ]; then
185-
./scripts/exec_test.sh $VERSION
185+
./scripts/exec_test.sh
186186
fi
187187
188188
# Run data quality tests
189-
- tb --semver $VERSION test run -v -c 4
189+
- tb test run -v -c 4
190190

191191
.tb_deploy_main:
192192
stage: cd
@@ -225,9 +225,9 @@ variables:
225225
# Deploy changes to the main Workspace
226226
- |
227227
DEPLOY_FILE=./deploy/${VERSION}/deploy.sh
228-
if [ ! -f "$DEPLOY_FILE" ] && [ "$VERSION" != "0.0.0" ]; then
228+
if [ ! -f "$DEPLOY_FILE" ]; then
229229
echo "$DEPLOY_FILE not found, running default tb deploy command"
230-
tb --semver ${VERSION} deploy ${CD_FLAGS}
230+
tb deploy ${CD_FLAGS}
231231
tb release ls
232232
fi
233233

scripts/append_fixtures.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ for extension in "${extensions[@]}"; do
1818
file_name=$(basename "$file_path")
1919
file_name_without_extension="${file_name%.*}"
2020

21-
command="tb --semver $VERSION datasource append $file_name_without_extension datasources/fixtures/$file_name"
21+
command="tb datasource append $file_name_without_extension datasources/fixtures/$file_name"
2222
echo $command
2323
$command
2424
done

scripts/exec_test.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,10 @@
22
set -euxo pipefail
33

44
export TB_VERSION_WARNING=0
5-
export VERSION=$1
65

76
run_test() {
87
t=$1
98
echo "** Running $t **"
10-
# Check if VERSION is provided
11-
if [[ -n $VERSION ]]; then
12-
sed -i "s/tb/tb --semver $VERSION/" $t
13-
fi
149
echo "** $(cat $t)"
1510
tmpfile=$(mktemp)
1611
retries=0
@@ -55,7 +50,7 @@ run_test() {
5550
export -f run_test
5651

5752
fail=0
58-
find ./tests -name "*.test" -print0 | xargs -0 -I {} -P 4 bash -c 'run_test "$@"' _ {} $VERSION || fail=1
53+
find ./tests -name "*.test" -print0 | xargs -0 -I {} -P 4 bash -c 'run_test "$@"' _ {} || fail=1
5954

6055
if [ $fail == 1 ]; then
6156
exit -1;

0 commit comments

Comments
 (0)