diff --git a/assignments/exercise-1/README.md b/assignments/exercise-1/README.md index 425dc273..73d9650a 100644 --- a/assignments/exercise-1/README.md +++ b/assignments/exercise-1/README.md @@ -8,7 +8,9 @@ ABCDEFIGHIJKLMNOPQRSTUVW12345` extracts to `Url: https://github.com/evl-8/github-action-demo` and `Token: ABCDEFIGHIJKLMNOPQRSTUVW12345` -5. Run the command
`docker run --name github-actions-runner -e URL= -e TOKEN= evl8/github-actions-runner` +5. Go into the cloned `esd-github-actions-assignment` and open the `docker-compose.yml` +6. Follow the instructions inside the file +7. Run `docker compose up` You have now created a Github actions runner! It should look like the picture beneath. diff --git a/assignments/exercise-3/README.md b/assignments/exercise-3/README.md index 3ddcfeaf..3da4e4f1 100644 --- a/assignments/exercise-3/README.md +++ b/assignments/exercise-3/README.md @@ -77,17 +77,26 @@ In this job, we will upload our final Jar to a nexus repository server - Setup Java 17 - Download the results from the previous job -- Execute `./gradlew publish` and add ```env: - ORG_GRADLE_PROJECT_dockerRepoUsername: ${{ secrets.REPO_USERNAME }} - ORG_GRADLE_PROJECT_dockerRepoPassword: ${{ secrets.REPO_PASSWORD }}``` +- Execute `./gradlew publish` + + +``` +env: + ORG_GRADLE_PROJECT_dockerRepoUsername: ${{ secrets.REPO_USERNAME }} + ORG_GRADLE_PROJECT_dockerRepoPassword: ${{ secrets.REPO_PASSWORD }} +``` ## Making a pull request ### Requirements +Edit the workflow so that: + - The workflow should run when pushing on branch "prod", "dev" and "stage" - The workflow should run when making a pull request on branch "prod", "dev" and "stage" +After that: + - Create a pull request from `dev` into `stage` - Wait for all Github actions and `Merge pull request` - Do the same for `stage` into prod \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index ecee4417..97bb8361 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,8 +2,8 @@ services: github-actions-runner: image: evl8/esd-github-actions-runner environment: - - URL=value - - TOKEN=value + - URL= + - TOKEN= networks: - esd nexus: