summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Zschocke <f.zschocke+git@gmail.com>2022-11-01 12:50:29 +0100
committerFlorian Zschocke <f.zschocke+git@gmail.com>2022-11-01 14:51:10 +0100
commit646231e54a2ee1edc97a5aa813f82638dfdef0b7 (patch)
tree6ac4b4eebd7ec35ee1bdd8e622ee72344daf0eee
parent66365658af0b6784aa12f99254f2e1dcf5d2b531 (diff)
downloadgitblit-646231e54a2ee1edc97a5aa813f82638dfdef0b7.tar.gz
gitblit-646231e54a2ee1edc97a5aa813f82638dfdef0b7.zip
Fix paths after update of checkout action
The Github 'checkout' action was updated from v1 to v3. But the behaviour changed between the two which broke this workflow. The old action would clone other repositories not into the workspace but parallel to the workspace. The new version does every clone/checkout relative to the workspace. That means that where previously the gitblit-docker repository would be cloned in parallel to the workspace which is gitblit/gitblit, it is now cloned into the gitblit/gitblit directory path. So remove all the references to `../gitblit-docker`. The files are in the current directory now.
-rw-r--r--.github/workflows/nightly-build.yml14
1 files changed, 4 insertions, 10 deletions
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 38a1ff17..5c70dd08 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -143,7 +143,6 @@ jobs:
id: get-gb
with:
name: gitblit-nightly
- path: ../gitblit-docker
# Delete the artifact unless this is the official Gitblit repo
- uses: geekyeggo/delete-artifact@v2
@@ -154,7 +153,6 @@ jobs:
- name: Extract snapshot version
id: gb-version
- working-directory: ../gitblit-docker
run: |
for file in $(ls -1 ${{steps.get-gb.outputs.download-path}}) ; do
if [[ "$file" = gitblit-*.gz ]] ; then gbver=$file ; fi
@@ -166,7 +164,6 @@ jobs:
echo "gb-version=$gbver" >> $GITHUB_OUTPUT
- name: Generate Dockerfile for snapshot image
- working-directory: ../gitblit-docker
run: |
generate/generate_dockerfile.sh -v ${{ steps.gb-version.outputs.gb-version }} > generate/Dockerfile
echo "BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%S)" >> "${GITHUB_ENV}"
@@ -180,8 +177,8 @@ jobs:
- name: Build snapshot docker image
uses: docker/build-push-action@v3
with:
- file: ../gitblit-docker/generate/Dockerfile
- context: ../gitblit-docker
+ file: generate/Dockerfile
+ context: .
load: true
tags: gitblit/gitblit:nightly
labels: |
@@ -196,14 +193,12 @@ jobs:
version: 'v0.3.16'
- name: Test docker container - normal mode
- working-directory: ../gitblit-docker
env:
GOSS_WAIT_OPTS: "-r 15s -s 5s > /dev/null"
run: |
dgoss run -p 8080:8080 -p 8443:8443 gitblit/gitblit:nightly
- name: Test docker container - bind mount
- working-directory: ../gitblit-docker
env:
GOSS_WAIT_OPTS: "-r 15s -s 5s > /dev/null"
run: |
@@ -220,7 +215,6 @@ jobs:
sudo rm -rf gitblit-data
- name: Test docker container - tmpfs
- working-directory: ../gitblit-docker
env:
GOSS_WAIT_OPTS: "-r 15s -s 5s > /dev/null"
run: |
@@ -229,8 +223,8 @@ jobs:
- name: Push docker image to registry
uses: docker/build-push-action@v3
with:
- file: ../gitblit-docker/generate/Dockerfile
- context: ../gitblit-docker
+ file: generate/Dockerfile
+ context: .
push: true
tags: gitblit/gitblit:nightly
labels: |