Skip to content

Try changing ubuntu #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 66 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
1a6ab35
Fix container check for “push” event.
Lord-Kamina Feb 15, 2023
c7f8be1
Fix diff_yml
Lord-Kamina Feb 16, 2023
3df8514
fix if condition
Lord-Kamina Feb 16, 2023
337b841
fix if again
Lord-Kamina Feb 16, 2023
85bd3c2
Fix if yet again?
Lord-Kamina Feb 16, 2023
740d7ee
jesus fuck
Lord-Kamina Feb 16, 2023
d94fa20
once again
Lord-Kamina Feb 16, 2023
4efbc19
keep trying
Lord-Kamina Feb 16, 2023
ecab454
one more
Lord-Kamina Feb 16, 2023
7a19530
invert?
Lord-Kamina Feb 16, 2023
5079234
still not
Lord-Kamina Feb 16, 2023
78e69fb
getting bortedf
Lord-Kamina Feb 16, 2023
5d28b06
GSASAAAHRFESF
Lord-Kamina Feb 16, 2023
6a6c27c
gergtd
Lord-Kamina Feb 16, 2023
028a2bd
gergtd—
Lord-Kamina Feb 16, 2023
6cd73dc
blah
Lord-Kamina Feb 16, 2023
107fa50
again
Lord-Kamina Feb 16, 2023
a9aa2eb
and again
Lord-Kamina Feb 16, 2023
0482d6a
come on
Lord-Kamina Feb 16, 2023
d3a67b6
-..
Lord-Kamina Feb 16, 2023
ee83d64
srs
Lord-Kamina Feb 16, 2023
d8093ff
come on
Lord-Kamina Feb 16, 2023
d6584ce
PLEASE
Lord-Kamina Feb 16, 2023
4ba0b3e
.
Lord-Kamina Feb 16, 2023
206b6d0
..
Lord-Kamina Feb 16, 2023
553ecce
Lord-Kamina Feb 16, 2023
d72397e
….
Lord-Kamina Feb 16, 2023
a127405
…..
Lord-Kamina Feb 16, 2023
6c8de1d
……
Lord-Kamina Feb 16, 2023
e798b9b
feck
Lord-Kamina Feb 16, 2023
4c034b2
derrr
Lord-Kamina Feb 16, 2023
34af9fe
derrr_-
Lord-Kamina Feb 16, 2023
0bff5b2
hurr
Lord-Kamina Feb 16, 2023
aabdbe6
again
Lord-Kamina Feb 16, 2023
8ddf39f
OTRO
Lord-Kamina Feb 16, 2023
8f9b4eb
.
Lord-Kamina Feb 16, 2023
f9025d1
again
Lord-Kamina Feb 16, 2023
744788e
gahj
Lord-Kamina Feb 16, 2023
67b3f96
..
Lord-Kamina Feb 16, 2023
c39d00c
-…
Lord-Kamina Feb 16, 2023
d2b52cb
….
Lord-Kamina Feb 16, 2023
54c9641
GAAAH
Lord-Kamina Feb 16, 2023
11c1918
simplify maybe?
Lord-Kamina Feb 16, 2023
8e1fe8f
more
Lord-Kamina Feb 16, 2023
bc754ef
one more
Lord-Kamina Feb 16, 2023
930a806
.
Lord-Kamina Feb 16, 2023
f7e972e
..
Lord-Kamina Feb 16, 2023
6559363
Lord-Kamina Feb 16, 2023
77b4110
otro
Lord-Kamina Feb 16, 2023
1c65e6a
mas
Lord-Kamina Feb 16, 2023
fc83299
ds
Lord-Kamina Feb 16, 2023
34fc2a5
dd
Lord-Kamina Feb 16, 2023
2fdb63a
ñ
Lord-Kamina Feb 16, 2023
32b6a71
ññ
Lord-Kamina Feb 16, 2023
3ba844d
ddd
Lord-Kamina Feb 16, 2023
48b2a4b
dddd
Lord-Kamina Feb 16, 2023
a27e162
simpler
Lord-Kamina Feb 16, 2023
24e8d59
ERHMAGERD
Lord-Kamina Feb 16, 2023
3b2a707
just work
Lord-Kamina Feb 16, 2023
4a5e22a
output again
Lord-Kamina Feb 16, 2023
aa47460
and again
Lord-Kamina Feb 16, 2023
802ea5c
try again
Lord-Kamina Feb 16, 2023
c7aa30e
jeez
Lord-Kamina Feb 16, 2023
d55b002
jeez louise
Lord-Kamina Feb 16, 2023
17c40cd
invert?
Lord-Kamina Feb 16, 2023
36390fb
Try changing ubuntu
Lord-Kamina Feb 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ jobs:
runs-on: ubuntu-latest
outputs:
build_docker_containers: ${{ steps.version.outputs.build_docker_containers }}
build_debian_containers: ${{ steps.version.outputs.build_debian_containers }}
build_ubuntu_containers: ${{ steps.version.outputs.build_ubuntu_containers }}
build_fedora_containers: ${{ steps.version.outputs.build_fedora_containers }}
steps:
- name: Checkout
id: checkout
Expand All @@ -40,30 +43,29 @@ jobs:
run: |
# Only run the container builds when something in the docker folder or
# this workflow has changed from master, or if it was cron triggered
cd ./.github/workflows
DIFF_YML=$(curl -L https://github.com/performous/performous/raw/master/.github/workflows/linux.yml 2>/dev/null | diff -q -- ./linux.yml - 1>/dev/null ; echo $?)

if [[ $DIFF_YML == 1 || '${{ github.event_name }}' == 'schedule' ]]; then
if [[ '${{ github.event_name }}' == 'push' ]]; then
base_version='${{ github.event.before }}'
else
base_version='origin/master'
fi
DIFF_YML=$((git rev-parse HEAD:.github/workflows/linux.yml && git diff --merge-base ${base_version} --exit-code -- .github/workflows/linux.yml) > /dev/null 2>&1 ; echo $?)
if [[ $DIFF_YML != 0 || '${{ github.event_name }}' == 'schedule' ]]; then
echo "Refresh all containers: TRUE"
echo "build_docker_containers=true" >> $GITHUB_OUTPUT
else
echo "Refresh all containers: FALSE"
echo "build_docker_containers=false" >> $GITHUB_OUTPUT
fi

cd ../../
git worktree add ./docker-master --no-checkout --detach
cd docker-master
if [[ ${GITHUB_BASE_REF} == "" ]]; then
GITHUB_BASE_REF="master"
fi
git checkout origin/${GITHUB_BASE_REF} -- docker
git worktree add ./docker-base --no-checkout --detach
cd docker-base
git checkout ${base_version} -- docker

DIFF_UBUNTU=$(diff -q ./docker/Dockerfile.ubuntu ../docker/Dockerfile.ubuntu 1>/dev/null ; echo $?)
DIFF_FEDORA=$(diff -q ./docker/Dockerfile.fedora ../docker/Dockerfile.fedora 1>/dev/null ; echo $?)
DIFF_DEBIAN=$(diff -q ./docker/Dockerfile.debian ../docker/Dockerfile.debian 1>/dev/null ; echo $?)
cd ..
git worktree remove docker-master --force
git worktree remove docker-base --force

if [[ $DIFF_UBUNTU == 1 ]]; then
echo "Refresh Ubuntu containers: TRUE"
Expand All @@ -81,7 +83,7 @@ jobs:
echo "build_fedora_containers=false" >> $GITHUB_OUTPUT
fi

if [[ $DIFF_debian == 1 ]]; then
if [[ $DIFF_DEBIAN == 1 ]]; then
echo "Refresh DEBIAN containers: TRUE"
echo "build_debian_containers=true" >> $GITHUB_OUTPUT
else
Expand Down Expand Up @@ -128,11 +130,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build ${{ matrix.os }} ${{ matrix.version }} Container
if: >-
${{
needs.determine_docker_version.outputs.build_docker_containers == 'true' ||
format('needs.determine_docker_version.outputs.build_{0}_containers', matrix.os) == 'true'
}}
if: needs.determine_docker_version.outputs[format('build_{0}_containers', matrix.os)] == 'true' || needs.determine_docker_version.outputs['build_docker_containers'] == 'true'
uses: docker/build-push-action@v3
with:
context: docker/
Expand All @@ -141,6 +139,7 @@ jobs:
tags: ${{ env.CONTAINER_NAME }}
build-args: OS_VERSION=${{ matrix.version }}


- name: Build package
# Don't build the packages if triggered by cron because it will not
# have the correct inputs required to construct the package names correctly.
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ COPY build_performous.sh /root/performous/build_performous.sh
COPY run_tests.sh /root/performous/run_tests.sh

WORKDIR /root/performous
##