address review comments for 0.0.9 upgrade

* remove code for submodules as they aren't used by obfs4proxy
* clean repo before zipping source tree
* allow CI failure for verification (new releases can only be verified
  after uploaded)
parent 24a0e01d
Pipeline #3010 passed with stages
in 8 minutes and 56 seconds
......@@ -24,14 +24,15 @@ build:
test:
stage: test
script:
- docker run -v `pwd`:/opt/go-reproducer ${TEST_IMAGE} /bin/bash -c "./build-obfs4proxy.py 0.0.9"
# - docker run -v `pwd`:/opt/go-reproducer ${TEST_IMAGE} /bin/bash -c "./build-obfs4proxy.py 0.0.9 && ./verify-obfs4proxy.py 0.0.9"
- docker run -v `pwd`:/opt/go-reproducer ${TEST_IMAGE} /bin/bash -c "./build-obfs4proxy.py 0.0.9 && ./verify-obfs4proxy.py 0.0.9"
allow_failure: true
artifacts:
paths:
- obfs4proxy-*.zip
- obfs4proxy-*.pom
- obfs4proxy-*-sources.jar
expire_in: 1 week
when: always
except:
- tags
......@@ -45,6 +46,7 @@ test_tag:
- obfs4proxy-*.pom
- obfs4proxy-*-sources.jar
expire_in: 1 week
when: always
only:
- tags
......@@ -54,5 +56,6 @@ release:
- docker pull $TEST_IMAGE
- docker tag $TEST_IMAGE $RELEASE_IMAGE
- docker push $RELEASE_IMAGE
when: on_success
only:
- master
......@@ -67,13 +67,8 @@ def checkout_source_repo(versions):
print("Checking out %s" % versions['revision'])
check_call(['git', 'checkout', '-f', versions['revision']], cwd=REPO_DIR)
# initialize and/or update submodules
# (after checkout, because submodules can point to non-existent commits on master)
check_call(['git', 'submodule', 'update', '--init', '--recursive'], cwd=REPO_DIR)
# undo all changes
check_call(['git', 'reset', '--hard'], cwd=REPO_DIR)
check_call(['git', 'submodule', 'foreach', 'git', 'reset', '--hard'], cwd=REPO_DIR)
# clean all untracked files and directories (-d) from repo
check_call(['git', 'clean', '-dffx'], cwd=REPO_DIR)
......@@ -155,6 +150,9 @@ def package(versions, file_list, android):
def create_sources_jar(versions):
# clean all untracked files and directories (-d) from repo
check_call(['git', 'clean', '-dffx'], cwd=REPO_DIR)
# vendorize dependencies
ex(['go', 'mod', 'vendor'], cwd=REPO_DIR)
jar_files = []
for file in glob(os.path.join(REPO_DIR, '*')):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment