Skip to content

Commit

Permalink
CI: try ubuntu-latest in main.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
JonJagger committed Sep 15, 2023
1 parent f623bec commit a371e32
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
pre-build:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
outputs:
image_tag: ${{ steps.prep.outputs.image_tag }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion build_test_publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export $(echo_versioner_env_vars)
exit_zero_if_show_help "$@"
exit_non_zero_unless_installed docker
exit_non_zero_unless_installed docker-compose
on_ci_upgrade_docker_compose
# on_ci_upgrade_docker_compose
remove_old_images
#generate_env_var_yml_files
on_ci_kosli_create_flow
Expand Down
11 changes: 11 additions & 0 deletions sh/on_ci_upgrade_docker_compose.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ on_ci_upgrade_docker_compose()
echo 'not on CI so not upgrading docker-compose'
else
echo 'on CI so upgrading docker-compose'
# docker-compose.yml uses this:
#
# volumes:
# - type: tmpfs
# target: /tmp
# tmpfs:
# mode: 01777
#
# and the mode: option is not supported in the version of docker-compose
# currently installed in ubuntu-latest in the Github Action's main.yml
#
# https://stackoverflow.com/questions/49839028
sudo curl -L "https://github.com/docker/compose/releases/download/`curl -fsSLI -o /dev/null -w %{url_effective} https://github.com/docker/compose/releases/latest | sed 's#.*tag/##g' && echo`/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose && sudo chmod +x /usr/local/bin/docker-compose
fi
Expand Down

0 comments on commit a371e32

Please sign in to comment.