Skip to content

Commit

Permalink
Update CI builds
Browse files Browse the repository at this point in the history
Use newer Ubuntu runner, new checkout action, and docker compose v2
instead of docker-compose v1
  • Loading branch information
matiasgarciaisaia committed Jan 4, 2024
1 parent 41b0ccc commit b86f53b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 15 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,30 @@ on: [push, pull_request]

jobs:
test:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set environment up
run: |
docker-compose pull
docker-compose build
docker-compose run --rm web bundle install
docker-compose run --rm web rake db:setup
docker-compose run --rm web rake db:test:prepare
docker compose pull
docker compose build
docker compose run --rm web bundle install
docker compose run --rm web rake db:setup
docker compose run --rm web rake db:test:prepare
- name: Run specs
run: |
docker-compose run --rm web rspec
docker compose run --rm web rspec
build:
needs: test
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
DOCKER_REPOSITORY: 'instedd/guisso'
DOCKER_USER: ${{ secrets.DOCKER_USER }}
DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Build image & push to Docker Hub
run: ./build.sh
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,9 @@ This practice is also recommended when running GUISSO locally.
Run the following commands to have a stable development environment.

```
$ docker-compose run --rm --no-deps web bundle install
$ docker-compose run --rm web bash
root@web_1 $ rake db:setup db:seed
$ docker-compose up
$ docker compose run --rm --no-deps web bundle install
$ docker compose run --rm web rake db:setup db:seed
$ docker compose up
```

## Intercom
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -eo pipefail

source <(curl -s https://raw.githubusercontent.com/manastech/ci-docker-builder/a2d44f8b7f155afe5a9652252cfb262871846a41/build.sh)
source <(curl -s https://raw.githubusercontent.com/manastech/ci-docker-builder/0084f2bbc0626341bd29f4f3dc13272f5d27d4ca/build.sh)

dockerSetup
echo $VERSION > VERSION
Expand Down

0 comments on commit b86f53b

Please sign in to comment.