Skip to content

chore: update circleci to ubuntu-2204:2024.08.1 (latest) machine image #1214

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 23, 2024
Merged

chore: update circleci to ubuntu-2204:2024.08.1 (latest) machine image #1214

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6458a33
chore: update circleci to ubuntu-2204:2024.08.1 (latest) machine image
MikeMcC399 Sep 20, 2024
2c8f4c6
Use --rm after docker compose run
MikeMcC399 Sep 20, 2024
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
28 changes: 14 additions & 14 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ commands:
jobs:
check-factory-versions:
machine:
image: ubuntu-2204:2024.05.1
image: ubuntu-2204:2024.08.1
steps:
- checkout
- expand-env-file
Expand All @@ -69,7 +69,7 @@ jobs:
- run:
name: check node version
command: |
ACTUAL_VERSION=$(docker compose run test-factory-all-included node -v)
ACTUAL_VERSION=$(docker compose run --rm test-factory-all-included node -v)
if [ v${NODE_VERSION} != "${ACTUAL_VERSION}" ]; then
echo "Version mismatch, v${NODE_VERSION} != ${ACTUAL_VERSION}"
exit 1;
Expand All @@ -79,7 +79,7 @@ jobs:
- run:
name: check yarn version
command: |
ACTUAL_VERSION=$(docker compose run test-factory-all-included yarn -v)
ACTUAL_VERSION=$(docker compose run --rm test-factory-all-included yarn -v)
if [ ${YARN_VERSION} != "${ACTUAL_VERSION}" ]; then
echo "Version mismatch, ${YARN_VERSION} != ${ACTUAL_VERSION}"
exit 1;
Expand All @@ -89,7 +89,7 @@ jobs:
- run:
name: check chrome version
command: |
ACTUAL_VERSION=$(docker compose run test-factory-all-included google-chrome --version | xargs)
ACTUAL_VERSION=$(docker compose run --rm test-factory-all-included google-chrome --version | xargs)
TRIMMED_CHROME_VERSION=$(echo ${CHROME_VERSION} | sed -e 's/-.*$//g')
if [ "Google Chrome ${TRIMMED_CHROME_VERSION}" != "${ACTUAL_VERSION}" ]; then
echo "Version mismatch, Google Chrome ${TRIMMED_CHROME_VERSION} != ${ACTUAL_VERSION}"
Expand All @@ -100,7 +100,7 @@ jobs:
- run:
name: check firefox version
command: |
ACTUAL_VERSION=$(docker compose run test-factory-all-included firefox --version)
ACTUAL_VERSION=$(docker compose run --rm test-factory-all-included firefox --version)
if [ "Mozilla Firefox ${FIREFOX_VERSION}" != "${ACTUAL_VERSION}" ]; then
echo "Version mismatch, Mozilla Firefox ${FIREFOX_VERSION} != ${ACTUAL_VERSION}"
exit 1;
Expand All @@ -110,7 +110,7 @@ jobs:
- run:
name: check edge version
command: |
ACTUAL_VERSION=$(docker compose run test-factory-all-included edge --version | xargs)
ACTUAL_VERSION=$(docker compose run --rm test-factory-all-included edge --version | xargs)
TRIMMED_EDGE_VERSION=$(echo ${EDGE_VERSION} | sed -e 's/-.*$//g')
if [ "Microsoft Edge ${TRIMMED_EDGE_VERSION}" != "${ACTUAL_VERSION}" ]; then
echo "Version mismatch, Microsoft Edge ${TRIMMED_EDGE_VERSION} != ${ACTUAL_VERSION}"
Expand All @@ -121,7 +121,7 @@ jobs:
- run:
name: check cypress version
command: |
ACTUAL_VERSION=$(docker compose run test-factory-all-included cypress -v)
ACTUAL_VERSION=$(docker compose run --rm test-factory-all-included cypress -v)
TRIMMED_ACTUAL_VERSION=$(echo ${ACTUAL_VERSION} | sed -e 's/ Cypress binary version:.*$//g')
if [ "Cypress package version: ${CYPRESS_VERSION}" != "${TRIMMED_ACTUAL_VERSION}" ]; then
echo "Version mismatch, Cypress package version: ${CYPRESS_VERSION} != ${TRIMMED_ACTUAL_VERSION}"
Expand All @@ -135,18 +135,18 @@ jobs:
# There is no check for a certain version of git
name: check git version
command: |
ACTUAL_VERSION=$(docker compose run test-factory-all-included git --version)
ACTUAL_VERSION=$(docker compose run --rm test-factory-all-included git --version)
echo "Version ${ACTUAL_VERSION} confirmed"
working_directory: factory/test-project
- run:
name: check ssh version # We don't really care what version ssh has as long as the command doesn't error
command: |
ACTUAL_VERSION=$(docker compose run test-factory-all-included ssh -V)
ACTUAL_VERSION=$(docker compose run --rm test-factory-all-included ssh -V)
echo "Version ${ACTUAL_VERSION} confirmed"
working_directory: factory/test-project
check-node-override-version:
machine:
image: ubuntu-2204:2024.05.1
image: ubuntu-2204:2024.08.1
steps:
- checkout
- expand-env-file
Expand All @@ -163,7 +163,7 @@ jobs:
- run:
name: check node version
command: |
ACTUAL_VERSION=$(docker compose run test-factory-node-override node -v)
ACTUAL_VERSION=$(docker compose run --rm test-factory-node-override node -v)
if [ v18.17.1 != "${ACTUAL_VERSION}" ]; then
echo "Version mismatch, v18.17.1 != ${ACTUAL_VERSION}"
exit 1;
Expand All @@ -172,7 +172,7 @@ jobs:
working_directory: factory/test-project
test-image:
machine:
image: ubuntu-2204:2024.05.1
image: ubuntu-2204:2024.08.1
parameters:
target:
type: string
Expand All @@ -197,12 +197,12 @@ jobs:
name: test
command: |
docker compose --progress plain build << parameters.test-target >>
docker compose run << parameters.test-target >>
docker compose run --rm << parameters.test-target >>
working_directory: factory/test-project

push:
machine:
image: ubuntu-2204:2024.05.1
image: ubuntu-2204:2024.08.1
parameters:
target:
type: string
Expand Down