diff --git a/03-cd/04-github-actions/.start-code/hangman-api/.env.template b/03-cd/03-github-actions/.start-code/hangman-api/.env.template similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/.env.template rename to 03-cd/03-github-actions/.start-code/hangman-api/.env.template diff --git a/03-cd/04-github-actions/.start-code/hangman-api/.gitignore b/03-cd/03-github-actions/.start-code/hangman-api/.gitignore similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/.gitignore rename to 03-cd/03-github-actions/.start-code/hangman-api/.gitignore diff --git a/03-cd/04-github-actions/.start-code/hangman-api/.prettierrc b/03-cd/03-github-actions/.start-code/hangman-api/.prettierrc similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/.prettierrc rename to 03-cd/03-github-actions/.start-code/hangman-api/.prettierrc diff --git a/03-cd/04-github-actions/.start-code/hangman-api/Dockerfile b/03-cd/03-github-actions/.start-code/hangman-api/Dockerfile similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/Dockerfile rename to 03-cd/03-github-actions/.start-code/hangman-api/Dockerfile diff --git a/03-cd/04-github-actions/.start-code/hangman-api/db/migrations/20221009094604_create_tables.js b/03-cd/03-github-actions/.start-code/hangman-api/db/migrations/20221009094604_create_tables.js similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/db/migrations/20221009094604_create_tables.js rename to 03-cd/03-github-actions/.start-code/hangman-api/db/migrations/20221009094604_create_tables.js diff --git a/03-cd/04-github-actions/.start-code/hangman-api/jest.config.integration.js b/03-cd/03-github-actions/.start-code/hangman-api/jest.config.integration.js similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/jest.config.integration.js rename to 03-cd/03-github-actions/.start-code/hangman-api/jest.config.integration.js diff --git a/03-cd/04-github-actions/.start-code/hangman-api/jest.config.specification.js b/03-cd/03-github-actions/.start-code/hangman-api/jest.config.specification.js similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/jest.config.specification.js rename to 03-cd/03-github-actions/.start-code/hangman-api/jest.config.specification.js diff --git a/03-cd/04-github-actions/.start-code/hangman-api/knexfile.js b/03-cd/03-github-actions/.start-code/hangman-api/knexfile.js similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/knexfile.js rename to 03-cd/03-github-actions/.start-code/hangman-api/knexfile.js diff --git a/03-cd/04-github-actions/.start-code/hangman-api/nodemon.json b/03-cd/03-github-actions/.start-code/hangman-api/nodemon.json similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/nodemon.json rename to 03-cd/03-github-actions/.start-code/hangman-api/nodemon.json diff --git a/03-cd/04-github-actions/.start-code/hangman-api/package-lock.json b/03-cd/03-github-actions/.start-code/hangman-api/package-lock.json similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/package-lock.json rename to 03-cd/03-github-actions/.start-code/hangman-api/package-lock.json diff --git a/03-cd/04-github-actions/.start-code/hangman-api/package.json b/03-cd/03-github-actions/.start-code/hangman-api/package.json similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/package.json rename to 03-cd/03-github-actions/.start-code/hangman-api/package.json diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/app.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/app.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/app.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/app.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/config.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/config.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/config.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/config.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/dals/database-manager.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/dals/database-manager.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/dals/database-manager.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/dals/database-manager.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/dals/entities/game.entities.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/dals/entities/game.entities.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/dals/entities/game.entities.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/dals/entities/game.entities.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/dals/entities/index.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/dals/entities/index.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/dals/entities/index.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/dals/entities/index.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/dals/entities/player.entities.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/dals/entities/player.entities.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/dals/entities/player.entities.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/dals/entities/player.entities.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/dals/entities/word.entities.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/dals/entities/word.entities.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/dals/entities/word.entities.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/dals/entities/word.entities.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/dals/games/game.contract.dal.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/dals/games/game.contract.dal.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/dals/games/game.contract.dal.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/dals/games/game.contract.dal.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/dals/games/game.dal.test.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/dals/games/game.dal.test.ts similarity index 95% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/dals/games/game.dal.test.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/dals/games/game.dal.test.ts index d8215564..f08b05af 100644 --- a/03-cd/04-github-actions/.start-code/hangman-api/src/dals/games/game.dal.test.ts +++ b/03-cd/03-github-actions/.start-code/hangman-api/src/dals/games/game.dal.test.ts @@ -23,7 +23,7 @@ beforeEach(async () => { describe('game.dal', () => { describe('getGames', () => { - test('resturns the games related to a player', async () => { + test('returns the games related to a player', async () => { // Arrange const playersDAL = playerDALFactory(db); const wordsDAL = wordDALFactory(db); diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/dals/games/game.dal.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/dals/games/game.dal.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/dals/games/game.dal.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/dals/games/game.dal.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/dals/players/player.contract.dal.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/dals/players/player.contract.dal.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/dals/players/player.contract.dal.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/dals/players/player.contract.dal.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/dals/players/player.dal.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/dals/players/player.dal.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/dals/players/player.dal.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/dals/players/player.dal.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/dals/words/word.contract.dal.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/dals/words/word.contract.dal.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/dals/words/word.contract.dal.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/dals/words/word.contract.dal.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/dals/words/word.dal.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/dals/words/word.dal.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/dals/words/word.dal.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/dals/words/word.dal.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/routes/index.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/routes/index.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/routes/index.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/routes/index.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/routes/routes.config.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/routes/routes.config.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/routes/routes.config.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/routes/routes.config.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/routes/topics.route.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/routes/topics.route.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/routes/topics.route.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/routes/topics.route.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/server/create-server-app.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/server/create-server-app.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/server/create-server-app.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/server/create-server-app.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/server/index.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/server/index.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/server/index.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/server/index.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/server/init-server.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/server/init-server.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/server/init-server.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/server/init-server.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/services/word-provider.service.spec.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/services/word-provider.service.spec.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/services/word-provider.service.spec.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/services/word-provider.service.spec.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/src/services/word-provider.service.ts b/03-cd/03-github-actions/.start-code/hangman-api/src/services/word-provider.service.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/src/services/word-provider.service.ts rename to 03-cd/03-github-actions/.start-code/hangman-api/src/services/word-provider.service.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-api/tsconfig.json b/03-cd/03-github-actions/.start-code/hangman-api/tsconfig.json similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-api/tsconfig.json rename to 03-cd/03-github-actions/.start-code/hangman-api/tsconfig.json diff --git a/03-cd/04-github-actions/.start-code/hangman-e2e/e2e/.gitignore b/03-cd/03-github-actions/.start-code/hangman-e2e/e2e/.gitignore similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-e2e/e2e/.gitignore rename to 03-cd/03-github-actions/.start-code/hangman-e2e/e2e/.gitignore diff --git a/03-cd/04-github-actions/.start-code/hangman-e2e/e2e/cypress-16.dockerfile b/03-cd/03-github-actions/.start-code/hangman-e2e/e2e/cypress-16.dockerfile similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-e2e/e2e/cypress-16.dockerfile rename to 03-cd/03-github-actions/.start-code/hangman-e2e/e2e/cypress-16.dockerfile diff --git a/03-cd/04-github-actions/.start-code/hangman-e2e/e2e/cypress.config.ts b/03-cd/03-github-actions/.start-code/hangman-e2e/e2e/cypress.config.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-e2e/e2e/cypress.config.ts rename to 03-cd/03-github-actions/.start-code/hangman-e2e/e2e/cypress.config.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-e2e/e2e/cypress/e2e/other-test.cy.ts b/03-cd/03-github-actions/.start-code/hangman-e2e/e2e/cypress/e2e/other-test.cy.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-e2e/e2e/cypress/e2e/other-test.cy.ts rename to 03-cd/03-github-actions/.start-code/hangman-e2e/e2e/cypress/e2e/other-test.cy.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-e2e/e2e/cypress/e2e/test.cy.ts b/03-cd/03-github-actions/.start-code/hangman-e2e/e2e/cypress/e2e/test.cy.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-e2e/e2e/cypress/e2e/test.cy.ts rename to 03-cd/03-github-actions/.start-code/hangman-e2e/e2e/cypress/e2e/test.cy.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-e2e/e2e/cypress/fixtures/example.json b/03-cd/03-github-actions/.start-code/hangman-e2e/e2e/cypress/fixtures/example.json similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-e2e/e2e/cypress/fixtures/example.json rename to 03-cd/03-github-actions/.start-code/hangman-e2e/e2e/cypress/fixtures/example.json diff --git a/03-cd/04-github-actions/.start-code/hangman-e2e/e2e/cypress/support/commands.ts b/03-cd/03-github-actions/.start-code/hangman-e2e/e2e/cypress/support/commands.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-e2e/e2e/cypress/support/commands.ts rename to 03-cd/03-github-actions/.start-code/hangman-e2e/e2e/cypress/support/commands.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-e2e/e2e/cypress/support/e2e.ts b/03-cd/03-github-actions/.start-code/hangman-e2e/e2e/cypress/support/e2e.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-e2e/e2e/cypress/support/e2e.ts rename to 03-cd/03-github-actions/.start-code/hangman-e2e/e2e/cypress/support/e2e.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-e2e/e2e/cypress/videos/other-test.cy.ts.mp4 b/03-cd/03-github-actions/.start-code/hangman-e2e/e2e/cypress/videos/other-test.cy.ts.mp4 similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-e2e/e2e/cypress/videos/other-test.cy.ts.mp4 rename to 03-cd/03-github-actions/.start-code/hangman-e2e/e2e/cypress/videos/other-test.cy.ts.mp4 diff --git a/03-cd/04-github-actions/.start-code/hangman-e2e/e2e/e2e.dockerfile b/03-cd/03-github-actions/.start-code/hangman-e2e/e2e/e2e.dockerfile similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-e2e/e2e/e2e.dockerfile rename to 03-cd/03-github-actions/.start-code/hangman-e2e/e2e/e2e.dockerfile diff --git a/03-cd/04-github-actions/.start-code/hangman-e2e/e2e/package-lock.json b/03-cd/03-github-actions/.start-code/hangman-e2e/e2e/package-lock.json similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-e2e/e2e/package-lock.json rename to 03-cd/03-github-actions/.start-code/hangman-e2e/e2e/package-lock.json diff --git a/03-cd/04-github-actions/.start-code/hangman-e2e/e2e/package.json b/03-cd/03-github-actions/.start-code/hangman-e2e/e2e/package.json similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-e2e/e2e/package.json rename to 03-cd/03-github-actions/.start-code/hangman-e2e/e2e/package.json diff --git a/03-cd/04-github-actions/.start-code/hangman-e2e/e2e/tsconfig.json b/03-cd/03-github-actions/.start-code/hangman-e2e/e2e/tsconfig.json similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-e2e/e2e/tsconfig.json rename to 03-cd/03-github-actions/.start-code/hangman-e2e/e2e/tsconfig.json diff --git a/03-cd/04-github-actions/.start-code/hangman-front/.babelrc b/03-cd/03-github-actions/.start-code/hangman-front/.babelrc similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/.babelrc rename to 03-cd/03-github-actions/.start-code/hangman-front/.babelrc diff --git a/03-cd/04-github-actions/.start-code/hangman-front/.editorconfig b/03-cd/03-github-actions/.start-code/hangman-front/.editorconfig similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/.editorconfig rename to 03-cd/03-github-actions/.start-code/hangman-front/.editorconfig diff --git a/03-cd/04-github-actions/.start-code/hangman-front/.gitignore b/03-cd/03-github-actions/.start-code/hangman-front/.gitignore similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/.gitignore rename to 03-cd/03-github-actions/.start-code/hangman-front/.gitignore diff --git a/03-cd/04-github-actions/.start-code/hangman-front/.prettierrc b/03-cd/03-github-actions/.start-code/hangman-front/.prettierrc similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/.prettierrc rename to 03-cd/03-github-actions/.start-code/hangman-front/.prettierrc diff --git a/03-cd/04-github-actions/.start-code/hangman-front/Dockerfile b/03-cd/03-github-actions/.start-code/hangman-front/Dockerfile similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/Dockerfile rename to 03-cd/03-github-actions/.start-code/hangman-front/Dockerfile diff --git a/03-cd/04-github-actions/.start-code/hangman-front/config/test/jest.js b/03-cd/03-github-actions/.start-code/hangman-front/config/test/jest.js similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/config/test/jest.js rename to 03-cd/03-github-actions/.start-code/hangman-front/config/test/jest.js diff --git a/03-cd/04-github-actions/.start-code/hangman-front/config/test/setup-after.ts b/03-cd/03-github-actions/.start-code/hangman-front/config/test/setup-after.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/config/test/setup-after.ts rename to 03-cd/03-github-actions/.start-code/hangman-front/config/test/setup-after.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-front/config/webpack/base.js b/03-cd/03-github-actions/.start-code/hangman-front/config/webpack/base.js similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/config/webpack/base.js rename to 03-cd/03-github-actions/.start-code/hangman-front/config/webpack/base.js diff --git a/03-cd/04-github-actions/.start-code/hangman-front/config/webpack/dev.js b/03-cd/03-github-actions/.start-code/hangman-front/config/webpack/dev.js similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/config/webpack/dev.js rename to 03-cd/03-github-actions/.start-code/hangman-front/config/webpack/dev.js diff --git a/03-cd/04-github-actions/.start-code/hangman-front/config/webpack/helpers.js b/03-cd/03-github-actions/.start-code/hangman-front/config/webpack/helpers.js similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/config/webpack/helpers.js rename to 03-cd/03-github-actions/.start-code/hangman-front/config/webpack/helpers.js diff --git a/03-cd/04-github-actions/.start-code/hangman-front/config/webpack/prod.js b/03-cd/03-github-actions/.start-code/hangman-front/config/webpack/prod.js similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/config/webpack/prod.js rename to 03-cd/03-github-actions/.start-code/hangman-front/config/webpack/prod.js diff --git a/03-cd/04-github-actions/.start-code/hangman-front/entry-point.sh b/03-cd/03-github-actions/.start-code/hangman-front/entry-point.sh similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/entry-point.sh rename to 03-cd/03-github-actions/.start-code/hangman-front/entry-point.sh diff --git a/03-cd/04-github-actions/.start-code/hangman-front/nginx.conf b/03-cd/03-github-actions/.start-code/hangman-front/nginx.conf similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/nginx.conf rename to 03-cd/03-github-actions/.start-code/hangman-front/nginx.conf diff --git a/03-cd/04-github-actions/.start-code/hangman-front/package-lock.json b/03-cd/03-github-actions/.start-code/hangman-front/package-lock.json similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/package-lock.json rename to 03-cd/03-github-actions/.start-code/hangman-front/package-lock.json diff --git a/03-cd/04-github-actions/.start-code/hangman-front/package.json b/03-cd/03-github-actions/.start-code/hangman-front/package.json similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/package.json rename to 03-cd/03-github-actions/.start-code/hangman-front/package.json diff --git a/03-cd/04-github-actions/.start-code/hangman-front/src/app.tsx b/03-cd/03-github-actions/.start-code/hangman-front/src/app.tsx similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/src/app.tsx rename to 03-cd/03-github-actions/.start-code/hangman-front/src/app.tsx diff --git a/03-cd/04-github-actions/.start-code/hangman-front/src/components/index.ts b/03-cd/03-github-actions/.start-code/hangman-front/src/components/index.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/src/components/index.ts rename to 03-cd/03-github-actions/.start-code/hangman-front/src/components/index.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-front/src/components/start-game.component.tsx b/03-cd/03-github-actions/.start-code/hangman-front/src/components/start-game.component.tsx similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/src/components/start-game.component.tsx rename to 03-cd/03-github-actions/.start-code/hangman-front/src/components/start-game.component.tsx diff --git a/03-cd/04-github-actions/.start-code/hangman-front/src/components/start-game.spec.tsx b/03-cd/03-github-actions/.start-code/hangman-front/src/components/start-game.spec.tsx similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/src/components/start-game.spec.tsx rename to 03-cd/03-github-actions/.start-code/hangman-front/src/components/start-game.spec.tsx diff --git a/03-cd/04-github-actions/.start-code/hangman-front/src/index.html b/03-cd/03-github-actions/.start-code/hangman-front/src/index.html similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/src/index.html rename to 03-cd/03-github-actions/.start-code/hangman-front/src/index.html diff --git a/03-cd/04-github-actions/.start-code/hangman-front/src/index.tsx b/03-cd/03-github-actions/.start-code/hangman-front/src/index.tsx similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/src/index.tsx rename to 03-cd/03-github-actions/.start-code/hangman-front/src/index.tsx diff --git a/03-cd/04-github-actions/.start-code/hangman-front/src/services/config.ts b/03-cd/03-github-actions/.start-code/hangman-front/src/services/config.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/src/services/config.ts rename to 03-cd/03-github-actions/.start-code/hangman-front/src/services/config.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-front/src/services/game.api.ts b/03-cd/03-github-actions/.start-code/hangman-front/src/services/game.api.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/src/services/game.api.ts rename to 03-cd/03-github-actions/.start-code/hangman-front/src/services/game.api.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-front/src/services/index.ts b/03-cd/03-github-actions/.start-code/hangman-front/src/services/index.ts similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/src/services/index.ts rename to 03-cd/03-github-actions/.start-code/hangman-front/src/services/index.ts diff --git a/03-cd/04-github-actions/.start-code/hangman-front/tsconfig.json b/03-cd/03-github-actions/.start-code/hangman-front/tsconfig.json similarity index 100% rename from 03-cd/04-github-actions/.start-code/hangman-front/tsconfig.json rename to 03-cd/03-github-actions/.start-code/hangman-front/tsconfig.json diff --git a/03-cd/04-github-actions/.start-code/readme.md b/03-cd/03-github-actions/.start-code/readme.md similarity index 100% rename from 03-cd/04-github-actions/.start-code/readme.md rename to 03-cd/03-github-actions/.start-code/readme.md diff --git a/03-cd/03-github-actions/README.md b/03-cd/03-github-actions/README.md new file mode 100644 index 00000000..80e6cce9 --- /dev/null +++ b/03-cd/03-github-actions/README.md @@ -0,0 +1,97 @@ +# Github Actions + +## Demos starting point + +You will find the needed code for the demos in [.start-code](./.start-code) folder. + +## What is Github Actions? + +GitHub Actions is a continuous integration and continuous delivery (CI/CD) platform that allows you to automate your build, test, and deployment pipeline. You can create workflows that build and test every pull request to your repository, or deploy merged pull requests to production. + +GitHub provides Linux, Windows, and macOS virtual machines to run your workflows, or you can host your own self-hosted runners in your own data center or cloud infrastructure. + +### Components + +- **Workflows**: a workflow is a configurable automated process that will run one or more jobs. Workflows are defined by a YAML file stored in the `.github/workflows` directory in a repository. It will run when triggered by an event in your repository, or they can be triggered manually, or at a defined schedule. +- **Events**: an event is a specific activity in a repositoru that triggers a workflow run. For example, when someone creates a PR, opens an issue or pushes a commit. +- **Jobs**: a job is a set of steps in a workflow that is executed on the same runner. Each step is either a shell script that will be executed or an action that will be run. Jobs may have dependencies with other jobs (or not) and run in parallel with others. +- **Actions**: an action is a custom application for the GitHub Actions platform that performs a complex but frequently repeated task. It helps you to reduce repetitive code in your workflow files. An action can pull your git repository from GitHub or set up the authentication to your cloud provider. You can write your own actions, or you can find actions to use in your workflows in the GitHub Marketplace. +- **Runners**: a runner is a server that runs your workflows when they're triggered. Each runner can run a single job at a time. GitHub provides Ubuntu Linux, Microsoft Windows, and macOS runners to run your workflows. + +## An example workflow + +```yaml +# Optional - The name of the workflow as it will appear in the "Actions" tab of the GitHub repository. If this field is omitted, the name of the workflow file will be used instead. +name: CI + +# Specifies the trigger for this workflow. In this case, the workflow will be trigger when a PR is opened to main or when commits are pushed into main. +on: + push: + branches: + - "main" + pull_request: + branches: [ main ] + +# Groups together all the jobs that run in this workflow. +jobs: + # Defines a job named 'audit' + audit: + # Configures the job to run on the latest version of an Ubuntu Linux runner. Jobs can be run in self-hosted runners too. + runs-on: ubuntu-latest + + # Groups together all the steps that run in the 'audit' job. Each item nested under this section is a separate action (uses) or shell script (run). + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Inspect machine + run: | # This '|' symbol allows to write several commands + ls -al + whoami + pwd + node -v +``` + +## About billing for GitHub Actions + +GitHub Actions is free for public repositories. For private repositories, each GitHub account receives a certain amount of free minutes and storage for use with GitHub-hosted runners, depending on the account's plan. + +### Included storage and minutes + +| **Plan** | **Storage** | **Minutes (per month)** | +|------------------|-------------|-------------------------| +| Free | 500 MB | 2000 | +| Pro | 1 GB | 3000 | +| Team | 2 GB | 3000 | +| Enterprise Cloud | 50 GB | 50000 | + +Jobs that run on Windows and macOS runners that GitHub hosts consume minutes at 2 and 10 times the rate that jobs on Linux runners consume. For example, using 1,000 Windows minutes would consume 2,000 of the minutes included in your account. Using 1,000 macOS minutes, would consume 10,000 minutes included in your account. + +### Per-minute rates + +| **vCPUs (on Linux machine)** | **Per-minute rate (USD)** | +|------------------------------|---------------------------| +| 2 | $0.008 | +| 4 | $0.016 | +| 8 | $0.032 | +| 16 | $0.064 | +| 32 | $0.128 | +| 64 | $0.256 | + +### Usage limits + +There are some limits whe using GitHub-hosted runners. + +| **Plan** | **Total concurrent jobs** | **Maximum concurrent macOs jobs** | +|------------------|---------------------------|-----------------------------------| +| Free | 20 | 5 | +| Pro | 40 | 5 | +| Team | 60 | 5 | +| Enterprise Cloud | 1000 | 50 | + +## Refernces + +- [Understanding Github Actions](https://docs.github.com/en/actions/learn-github-actions/understanding-github-actions) +- [Workflow syntax](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions) +- [About self-hosted runners](https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners) +- [About billing for GitHub Actions](https://docs.github.com/en/billing/managing-billing-for-github-actions/about-billing-for-github-actions) +- [Pricing calculator for GitHub Actions](https://github.com/pricing/calculator?feature=actions) diff --git a/03-cd/03-azure-devops/hello-world/.dockerignore b/03-cd/old/azure-devops/hello-world/.dockerignore similarity index 92% rename from 03-cd/03-azure-devops/hello-world/.dockerignore rename to 03-cd/old/azure-devops/hello-world/.dockerignore index cffaab18..d2cc1467 100644 --- a/03-cd/03-azure-devops/hello-world/.dockerignore +++ b/03-cd/old/azure-devops/hello-world/.dockerignore @@ -1,23 +1,23 @@ -**/.classpath -**/.dockerignore -**/.env -**/.git -**/.gitignore -**/.project -**/.settings -**/.toolstarget -**/.vs -**/.vscode -**/*.*proj.user -**/*.dbmdl -**/*.jfm -**/azds.yaml -**/charts -**/docker-compose* -**/Dockerfile* -**/node_modules -**/npm-debug.log -**/obj -**/secrets.dev.yaml -**/values.dev.yaml -README.md +**/.classpath +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/azds.yaml +**/charts +**/docker-compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj +**/secrets.dev.yaml +**/values.dev.yaml +README.md diff --git a/03-cd/03-azure-devops/hello-world/.eslintrc.js b/03-cd/old/azure-devops/hello-world/.eslintrc.js similarity index 100% rename from 03-cd/03-azure-devops/hello-world/.eslintrc.js rename to 03-cd/old/azure-devops/hello-world/.eslintrc.js diff --git a/03-cd/03-azure-devops/hello-world/.gitignore b/03-cd/old/azure-devops/hello-world/.gitignore similarity index 100% rename from 03-cd/03-azure-devops/hello-world/.gitignore rename to 03-cd/old/azure-devops/hello-world/.gitignore diff --git a/03-cd/03-azure-devops/hello-world/Dockerfile b/03-cd/old/azure-devops/hello-world/Dockerfile similarity index 97% rename from 03-cd/03-azure-devops/hello-world/Dockerfile rename to 03-cd/old/azure-devops/hello-world/Dockerfile index 7d9d6036..986ad0e8 100644 --- a/03-cd/03-azure-devops/hello-world/Dockerfile +++ b/03-cd/old/azure-devops/hello-world/Dockerfile @@ -1,10 +1,10 @@ -FROM node:12.18-alpine -LABEL maintainer="Gisela Torres" -ENV NODE_ENV production -WORKDIR /usr/src/app -COPY ["package.json", "package-lock.json*", "npm-shrinkwrap.json*", "./"] -RUN npm install --silent --production && mv node_modules ../ -COPY . . -# RUN npm run test -EXPOSE 3000 +FROM node:12.18-alpine +LABEL maintainer="Gisela Torres" +ENV NODE_ENV production +WORKDIR /usr/src/app +COPY ["package.json", "package-lock.json*", "npm-shrinkwrap.json*", "./"] +RUN npm install --silent --production && mv node_modules ../ +COPY . . +# RUN npm run test +EXPOSE 3000 CMD ["npm", "start"] \ No newline at end of file diff --git a/03-cd/03-azure-devops/hello-world/index.html b/03-cd/old/azure-devops/hello-world/index.html similarity index 100% rename from 03-cd/03-azure-devops/hello-world/index.html rename to 03-cd/old/azure-devops/hello-world/index.html diff --git a/03-cd/03-azure-devops/hello-world/package-lock.json b/03-cd/old/azure-devops/hello-world/package-lock.json similarity index 100% rename from 03-cd/03-azure-devops/hello-world/package-lock.json rename to 03-cd/old/azure-devops/hello-world/package-lock.json diff --git a/03-cd/03-azure-devops/hello-world/package.json b/03-cd/old/azure-devops/hello-world/package.json similarity index 100% rename from 03-cd/03-azure-devops/hello-world/package.json rename to 03-cd/old/azure-devops/hello-world/package.json diff --git a/03-cd/03-azure-devops/hello-world/server.js b/03-cd/old/azure-devops/hello-world/server.js similarity index 100% rename from 03-cd/03-azure-devops/hello-world/server.js rename to 03-cd/old/azure-devops/hello-world/server.js