From 9f4ae6528ea369cea6a34f5c8f7242a9d3b7bad3 Mon Sep 17 00:00:00 2001 From: Preston Blake Date: Tue, 21 Feb 2023 10:27:29 -0800 Subject: [PATCH 01/13] closes issue #1 --- GameDie.cpp | 2 +- Roller | Bin 0 -> 71075 bytes main.cpp | 5 ++--- 3 files changed, 3 insertions(+), 4 deletions(-) create mode 100755 Roller diff --git a/GameDie.cpp b/GameDie.cpp index d8ecb3a..8dd274c 100644 --- a/GameDie.cpp +++ b/GameDie.cpp @@ -29,7 +29,7 @@ GameDie::GameDie(unsigned int num) { // generate a random number between 1-n where n is the counter size // (inclusive) and return it int GameDie::roll() { - int roll = rand_r() % roll_counter.size(); + int roll = rand() % roll_counter.size(); roll_counter[roll]++; return roll + 1; } diff --git a/Roller b/Roller new file mode 100755 index 0000000000000000000000000000000000000000..9db5e365feddfc37026a4f6cb43f7b4ccf3c9277 GIT binary patch literal 71075 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 cdE1ftom<{)p0i=gPz1{u)0O9of!T\n" << "--------------------\n" @@ -15,8 +15,7 @@ int main(int argc, char *argv[]) { << "--------------------\n" << " - Required; a number 1 or greater representing the number\n" << " of faces on the die being rolled\n"; - } - else { + } else { int faces = std::atoi(argv[1]); GameDie die(faces); cout << die.roll() << endl; From a35a667671ef20e17933130e7d76ba8c1afe04e0 Mon Sep 17 00:00:00 2001 From: Preston Blake Date: Tue, 21 Feb 2023 10:43:45 -0800 Subject: [PATCH 02/13] closes issue #2 ci --- .github/workflows/build-docker.yml | 15 +++++++++++++++ .github/workflows/cpplinter.yml | 12 ++++++++++++ README.md | 3 +++ 3 files changed, 30 insertions(+) create mode 100644 .github/workflows/build-docker.yml create mode 100644 .github/workflows/cpplinter.yml diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml new file mode 100644 index 0000000..41dd461 --- /dev/null +++ b/.github/workflows/build-docker.yml @@ -0,0 +1,15 @@ +name: Build Docker + +on: + push: + branches: ["main"] + pull_request: + branches: ["main"] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Build the Docker image + run: docker build . --file Dockerfile --tag roller \ No newline at end of file diff --git a/.github/workflows/cpplinter.yml b/.github/workflows/cpplinter.yml new file mode 100644 index 0000000..8a82cfa --- /dev/null +++ b/.github/workflows/cpplinter.yml @@ -0,0 +1,12 @@ +name: cpplint +on: + pull_request: + branches: ["main"] +jobs: + cpplint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: actions/setup-python@v1 + - run: pip install cpplint + - run: cpplint --recursive . \ No newline at end of file diff --git a/README.md b/README.md index d46f7c6..92a337f 100644 --- a/README.md +++ b/README.md @@ -41,3 +41,6 @@ To check for your program's adoption of the style guide, within the docker container (see above), run **cpplint**: `cpplint *.cpp *.h` + + +[![CI](https://github.com/prestonmasseyblake/Roller/actions/workflows/build-docker.yml/badge.svg)](https://github.com/prestonmasseyblake/Roller/actions/workflows/build-docker.yml) From d718780e0d156e648efc954b309d8c5c373d4e89 Mon Sep 17 00:00:00 2001 From: Preston Blake Date: Tue, 21 Feb 2023 10:47:33 -0800 Subject: [PATCH 03/13] closes issue #2 ci --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 92a337f..45a1609 100644 --- a/README.md +++ b/README.md @@ -43,4 +43,4 @@ container (see above), run **cpplint**: `cpplint *.cpp *.h` -[![CI](https://github.com/prestonmasseyblake/Roller/actions/workflows/build-docker.yml/badge.svg)](https://github.com/prestonmasseyblake/Roller/actions/workflows/build-docker.yml) +[![ci-pipeline](https://github.com/prestonmasseyblake/Roller/actions/workflows/build-docker.yml/badge.svg)](https://github.com/prestonmasseyblake/Roller/actions/workflows/build-docker.yml) From 2e974e0e3850dad4621dac92ba89629c674a0f39 Mon Sep 17 00:00:00 2001 From: Preston Blake Date: Tue, 21 Feb 2023 10:54:31 -0800 Subject: [PATCH 04/13] closes issue #2 ci --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 45a1609..04b09e4 100644 --- a/README.md +++ b/README.md @@ -43,4 +43,4 @@ container (see above), run **cpplint**: `cpplint *.cpp *.h` -[![ci-pipeline](https://github.com/prestonmasseyblake/Roller/actions/workflows/build-docker.yml/badge.svg)](https://github.com/prestonmasseyblake/Roller/actions/workflows/build-docker.yml) +[![CI](https://github.com/prestonmasseyblake/Roller/actions/workflows/build-docker.yml/badge.svg?branch=ci-pipeline)](https://github.com/prestonmasseyblake/Roller/actions/workflows/build-docker.yml?branch=feature-1) From da0559e284b19260b639401eec2c0a5e8b4f4fce Mon Sep 17 00:00:00 2001 From: Preston Blake Date: Tue, 21 Feb 2023 14:26:02 -0800 Subject: [PATCH 05/13] added status badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 04b09e4..957a564 100644 --- a/README.md +++ b/README.md @@ -43,4 +43,4 @@ container (see above), run **cpplint**: `cpplint *.cpp *.h` -[![CI](https://github.com/prestonmasseyblake/Roller/actions/workflows/build-docker.yml/badge.svg?branch=ci-pipeline)](https://github.com/prestonmasseyblake/Roller/actions/workflows/build-docker.yml?branch=feature-1) +[![CI Build](https://github.com/prestonmasseyblake/Roller/actions/workflows/build-docker.yml/badge.svg)](https://github.com/prestonmasseyblake/Roller/actions/workflows/build-docker.yml) From c4ee411e87d67a7c94f38a7b197ac98a1f278216 Mon Sep 17 00:00:00 2001 From: Preston Blake Date: Tue, 21 Feb 2023 15:39:31 -0800 Subject: [PATCH 06/13] fixing status badge --- .github/workflows/build-docker.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 41dd461..7b34008 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -1,10 +1,9 @@ name: Build Docker - on: - push: - branches: ["main"] pull_request: branches: ["main"] + push: + branches: ["main"] jobs: build: @@ -12,4 +11,4 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build the Docker image - run: docker build . --file Dockerfile --tag roller \ No newline at end of file + run: docker build . --file Dockerfile \ No newline at end of file From 1e971b57d7e7c6736749688c38bae564b32fdf54 Mon Sep 17 00:00:00 2001 From: Preston Blake <54560022+prestonmasseyblake@users.noreply.github.com> Date: Tue, 21 Feb 2023 18:16:02 -0800 Subject: [PATCH 07/13] Create docker-image.yml --- .github/workflows/docker-image.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000..d657a63 --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,18 @@ +name: Docker Image CI + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Build the Docker image + run: docker build . --file Dockerfile --tag my-image-name:$(date +%s) From 0ef8a3603390245b627093c4ec1549a42e79a4ac Mon Sep 17 00:00:00 2001 From: Preston Blake Date: Tue, 21 Feb 2023 18:18:04 -0800 Subject: [PATCH 08/13] fixing status badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 957a564..b79901f 100644 --- a/README.md +++ b/README.md @@ -43,4 +43,4 @@ container (see above), run **cpplint**: `cpplint *.cpp *.h` -[![CI Build](https://github.com/prestonmasseyblake/Roller/actions/workflows/build-docker.yml/badge.svg)](https://github.com/prestonmasseyblake/Roller/actions/workflows/build-docker.yml) +[![CI Build](https://github.com/prestonmasseyblake/Roller/actions/workflows/docker-image.yml/badge.svg)](https://github.com/prestonmasseyblake/Roller/actions/workflows/docker-image.yml) From 138f00de48dfe4d4eb2e219e7935eae27d9ccd8b Mon Sep 17 00:00:00 2001 From: Preston Blake Date: Tue, 21 Feb 2023 18:19:58 -0800 Subject: [PATCH 09/13] fixing status badge --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b79901f..02bea2e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +![CI Build](https://github.com/prestonmasseyblake/Roller/actions/workflows/docker-image.yml/badge.svg) + # Roller This repository provides a program that rolls a game die, such as the @@ -43,4 +45,4 @@ container (see above), run **cpplint**: `cpplint *.cpp *.h` -[![CI Build](https://github.com/prestonmasseyblake/Roller/actions/workflows/docker-image.yml/badge.svg)](https://github.com/prestonmasseyblake/Roller/actions/workflows/docker-image.yml) + From 4ee06275ea34a8186fca3fa2a60229c86dae518c Mon Sep 17 00:00:00 2001 From: Preston Blake Date: Tue, 21 Feb 2023 18:40:48 -0800 Subject: [PATCH 10/13] added comment to readme.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 02bea2e..d5edf30 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![CI Build](https://github.com/prestonmasseyblake/Roller/actions/workflows/docker-image.yml/badge.svg) +## HERE IS: ![CI Build](https://github.com/prestonmasseyblake/Roller/actions/workflows/docker-image.yml/badge.svg) # Roller From cf17c0af801a335b35522f7fc19c0d2e919afd74 Mon Sep 17 00:00:00 2001 From: Preston Blake Date: Tue, 21 Feb 2023 18:45:05 -0800 Subject: [PATCH 11/13] change name of Docker Image CiCD and changed README --- .github/workflows/docker-image.yml | 2 +- README.md | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index d657a63..fae21b3 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,4 +1,4 @@ -name: Docker Image CI +name: Docker Image CI-CD on: push: diff --git a/README.md b/README.md index d5edf30..fc8aec3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ -## HERE IS: ![CI Build](https://github.com/prestonmasseyblake/Roller/actions/workflows/docker-image.yml/badge.svg) +![CI Build](https://github.com/prestonmasseyblake/Roller/actions/workflows/docker-image.yml/badge.svg) + + +![example workflow](https://github.com/github/docs/actions/workflows/main.yml/badge.svg) # Roller From 6aa5d6384955496e3c128b317498c8a66e2bc07e Mon Sep 17 00:00:00 2001 From: Preston Blake Date: Tue, 21 Feb 2023 18:49:48 -0800 Subject: [PATCH 12/13] Updated docker-image.yml. needed to add the 'ci-pipeline' branch to branches github should see the workflow. --- .github/workflows/docker-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index fae21b3..a58456d 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -2,9 +2,9 @@ name: Docker Image CI-CD on: push: - branches: [ "main" ] + branches: [ "main", "ci-pipeline" ] pull_request: - branches: [ "main" ] + branches: [ "main", "ci-pipeline" ] jobs: From 4d4bea1eaa38c8b596191670d26dc3e79437472a Mon Sep 17 00:00:00 2001 From: Preston Blake Date: Tue, 21 Feb 2023 18:57:31 -0800 Subject: [PATCH 13/13] Updated docker-image.yml. needed to add the 'ci-pipeline' branch to branches github should see the workflow. --- .github/workflows/build-docker.yml | 14 -------------- .github/workflows/cpplinter.yml | 2 +- README.md | 5 +---- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 .github/workflows/build-docker.yml diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml deleted file mode 100644 index 7b34008..0000000 --- a/.github/workflows/build-docker.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Build Docker -on: - pull_request: - branches: ["main"] - push: - branches: ["main"] - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Build the Docker image - run: docker build . --file Dockerfile \ No newline at end of file diff --git a/.github/workflows/cpplinter.yml b/.github/workflows/cpplinter.yml index 8a82cfa..05e3fcd 100644 --- a/.github/workflows/cpplinter.yml +++ b/.github/workflows/cpplinter.yml @@ -1,7 +1,7 @@ name: cpplint on: pull_request: - branches: ["main"] + branches: ["main", "ci-pipeline"] jobs: cpplint: runs-on: ubuntu-latest diff --git a/README.md b/README.md index fc8aec3..a1ae67f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,4 @@ -![CI Build](https://github.com/prestonmasseyblake/Roller/actions/workflows/docker-image.yml/badge.svg) - - -![example workflow](https://github.com/github/docs/actions/workflows/main.yml/badge.svg) +[![Docker Image CI-CD](https://github.com/prestonmasseyblake/Roller/actions/workflows/docker-image.yml/badge.svg)](https://github.com/prestonmasseyblake/Roller/actions/workflows/docker-image.yml) # Roller