Skip to content

Commit 6dffef3

Browse files
rv-auditorrv-auditor
committed
Merge remote-tracking branch 'origin/develop'
2 parents 5babf74 + c36beb8 commit 6dffef3

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

‎.github/actions/test-package/action.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ runs:
1818
- name: 'Set up Docker'
1919
uses: ./.github/actions/with-docker
2020
with:
21-
tag: k-package-build-${{ inputs.distro }}
21+
tag: k-package-build-${{ inputs.distro }}-${{ github.sha }}
2222
subdir: k-${{ inputs.distro }}/
2323
distro: ${{ inputs.distro }}
2424
llvm: ${{ inputs.llvm }}
@@ -28,19 +28,19 @@ runs:
2828
DISTRO: ${{ inputs.distro }}
2929
run: |
3030
set -euxo pipefail
31-
docker exec -t k-package-build-${DISTRO} /bin/bash -c 'mv package/debian debian'
32-
docker exec -t k-package-build-${DISTRO} /bin/bash -c 'mv debian/compat.jammy debian/compat'
33-
docker exec -t k-package-build-${DISTRO} /bin/bash -c 'mv debian/control.jammy debian/control'
34-
docker exec -t k-package-build-${DISTRO} /bin/bash -c 'mv debian/rules.jammy debian/rules'
35-
docker exec -t k-package-build-${DISTRO} /bin/bash -c 'dpkg-buildpackage'
31+
docker exec -t k-package-build-${DISTRO}-${GITHUB_SHA} /bin/bash -c 'mv package/debian debian'
32+
docker exec -t k-package-build-${DISTRO}-${GITHUB_SHA} /bin/bash -c 'mv debian/compat.jammy debian/compat'
33+
docker exec -t k-package-build-${DISTRO}-${GITHUB_SHA} /bin/bash -c 'mv debian/control.jammy debian/control'
34+
docker exec -t k-package-build-${DISTRO}-${GITHUB_SHA} /bin/bash -c 'mv debian/rules.jammy debian/rules'
35+
docker exec -t k-package-build-${DISTRO}-${GITHUB_SHA} /bin/bash -c 'dpkg-buildpackage'
3636
- name: 'Tear down Docker'
3737
shell: bash {0}
3838
env:
3939
DISTRO: ${{ inputs.distro }}
4040
if: always()
4141
run: |
42-
docker stop --time=0 k-package-build-${DISTRO}
43-
docker container rm --force k-package-build-${DISTRO} || true
42+
docker stop --time=0 k-package-build-${DISTRO}-${GITHUB_SHA}
43+
docker container rm --force k-package-build-${DISTRO}-${GITHUB_SHA} || true
4444
- name: 'Set up Docker Test Image: ${{ inputs.distro }}'
4545
shell: bash {0}
4646
env:
@@ -50,7 +50,7 @@ runs:
5050
workspace=$(pwd)
5151
cd k-${DISTRO}
5252
docker run \
53-
--name k-package-test-${DISTRO} \
53+
--name k-package-test-${DISTRO}-${GITHUB_SHA} \
5454
--rm -it \
5555
--detach \
5656
--workdir /opt/workspace \
@@ -65,15 +65,15 @@ runs:
6565
DISTRO: ${{ inputs.distro }}
6666
run: |
6767
set -euxo pipefail
68-
docker exec -t k-package-test-${DISTRO} /bin/bash -c "k-${DISTRO}/src/main/scripts/test-in-container-debian"
68+
docker exec -t k-package-test-${DISTRO}-${GITHUB_SHA} /bin/bash -c "k-${DISTRO}/src/main/scripts/test-in-container-debian"
6969
- name: 'Tear down Docker Test'
7070
shell: bash {0}
7171
env:
7272
DISTRO: ${{ inputs.distro }}
7373
if: always()
7474
run: |
75-
docker stop --time=0 k-package-test-${DISTRO}
76-
docker container rm --force k-package-test-${DISTRO} || true
75+
docker stop --time=0 k-package-test-${DISTRO}-${GITHUB_SHA}
76+
docker container rm --force k-package-test-${DISTRO}-${GITHUB_SHA} || true
7777
- name: 'Rename Package'
7878
shell: bash {0}
7979
env:

‎.github/workflows/release.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ jobs:
5959
version_tag=ubuntu-jammy-${version}
6060
docker login --username rvdockerhub --password ${DOCKERHUB_PASSWORD}
6161
docker image build . --file package/docker/Dockerfile.ubuntu-jammy --tag ${DOCKERHUB_REPO}:${version_tag}
62-
docker run --name k-package-docker-test-jammy --rm -it --detach ${DOCKERHUB_REPO}:${version_tag}
63-
docker exec -t k-package-docker-test-jammy bash -c 'cd ~ && echo "module TEST imports BOOL endmodule" > test.k'
64-
docker exec -t k-package-docker-test-jammy bash -c 'cd ~ && kompile test.k --backend llvm'
65-
docker exec -t k-package-docker-test-jammy bash -c 'cd ~ && kompile test.k --backend haskell'
62+
docker run --name k-package-docker-test-jammy-${GITHUB_SHA} --rm -it --detach ${DOCKERHUB_REPO}:${version_tag}
63+
docker exec -t k-package-docker-test-jammy-${GITHUB_SHA} bash -c 'cd ~ && echo "module TEST imports BOOL endmodule" > test.k'
64+
docker exec -t k-package-docker-test-jammy-${GITHUB_SHA} bash -c 'cd ~ && kompile test.k --backend llvm'
65+
docker exec -t k-package-docker-test-jammy-${GITHUB_SHA} bash -c 'cd ~ && kompile test.k --backend haskell'
6666
docker image push ${DOCKERHUB_REPO}:${version_tag}
6767
- name: 'Clean up Docker Container'
6868
if: always()
6969
run: |
70-
docker stop --time=0 k-package-docker-test-jammy
70+
docker stop --time=0 k-package-docker-test-jammy-${GITHUB_SHA}
7171
7272
ubuntu-focal:
7373
name: 'K Ubuntu Focal Package'
@@ -98,15 +98,15 @@ jobs:
9898
version_tag=ubuntu-focal-${version}
9999
docker login --username rvdockerhub --password ${DOCKERHUB_PASSWORD}
100100
docker image build . --file package/docker/Dockerfile.ubuntu-focal --tag ${DOCKERHUB_REPO}:${version_tag}
101-
docker run --name k-package-docker-test-focal --rm -it --detach ${DOCKERHUB_REPO}:${version_tag}
102-
docker exec -t k-package-docker-test-focal bash -c 'cd ~ && echo "module TEST imports BOOL endmodule" > test.k'
103-
docker exec -t k-package-docker-test-focal bash -c 'cd ~ && kompile test.k --backend llvm'
104-
docker exec -t k-package-docker-test-focal bash -c 'cd ~ && kompile test.k --backend haskell'
101+
docker run --name k-package-docker-test-focal-${GITHUB_SHA} --rm -it --detach ${DOCKERHUB_REPO}:${version_tag}
102+
docker exec -t k-package-docker-test-focal-${GITHUB_SHA} bash -c 'cd ~ && echo "module TEST imports BOOL endmodule" > test.k'
103+
docker exec -t k-package-docker-test-focal-${GITHUB_SHA} bash -c 'cd ~ && kompile test.k --backend llvm'
104+
docker exec -t k-package-docker-test-focal-${GITHUB_SHA} bash -c 'cd ~ && kompile test.k --backend haskell'
105105
docker image push ${DOCKERHUB_REPO}:${version_tag}
106106
- name: Clean up Docker Container
107107
if: always()
108108
run: |
109-
docker stop --time=0 k-package-docker-test-focal
109+
docker stop --time=0 k-package-docker-test-focal-${GITHUB_SHA}
110110
111111
macos-build:
112112
name: 'Build MacOS Package'

‎.github/workflows/test-pr.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ jobs:
8484
- name: 'Set up Docker'
8585
uses: ./.github/actions/with-docker
8686
with:
87-
tag: k-ci
87+
tag: k-ci-${{ github.sha }}
8888
distro: jammy
8989
llvm: 14
9090
- name: 'Build and Test K'
91-
run: docker exec -t k-ci /bin/bash -c 'mvn verify --batch-mode -U'
91+
run: docker exec -t k-ci-${GITHUB_SHA} /bin/bash -c 'mvn verify --batch-mode -U'
9292
- name: 'Check out k-exercises'
9393
uses: actions/checkout@v3
9494
with:
@@ -98,14 +98,14 @@ jobs:
9898
path: k-exercises
9999
- name: 'Tutorial Integration Tests'
100100
run: |
101-
docker exec -t k-ci /bin/bash -c 'k-distribution/target/release/k/bin/spawn-kserver kserver.log'
102-
docker exec -t k-ci /bin/bash -c 'cd k-exercises/tutorial && make -j`nproc` --output-sync'
103-
docker exec -t k-ci /bin/bash -c 'cd k-distribution/k-tutorial/1_basic && ./test_kompile.sh'
101+
docker exec -t k-ci-${GITHUB_SHA} /bin/bash -c 'k-distribution/target/release/k/bin/spawn-kserver kserver.log'
102+
docker exec -t k-ci-${GITHUB_SHA} /bin/bash -c 'cd k-exercises/tutorial && make -j`nproc` --output-sync'
103+
docker exec -t k-ci-${GITHUB_SHA} /bin/bash -c 'cd k-distribution/k-tutorial/1_basic && ./test_kompile.sh'
104104
- name: 'Tear down Docker'
105105
if: always()
106106
run: |
107-
docker stop --time=0 k-ci
108-
docker container rm --force k-ci || true
107+
docker stop --time=0 k-ci-${GITHUB_SHA}
108+
docker container rm --force k-ci-${GITHUB_SHA} || true
109109
110110
test-package-ubuntu-jammy:
111111
name: 'K Ubuntu Jammy Package'

0 commit comments

Comments
 (0)