From fe3107e3952e5bd1b0987bb10534b62373483b48 Mon Sep 17 00:00:00 2001 From: Maxi Montenegro Date: Fri, 10 Jun 2022 20:52:51 -0300 Subject: [PATCH 1/2] change actiion version --- .github/workflows/deploy_to_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_to_test.yml b/.github/workflows/deploy_to_test.yml index 8f53756..cbee67d 100644 --- a/.github/workflows/deploy_to_test.yml +++ b/.github/workflows/deploy_to_test.yml @@ -38,7 +38,7 @@ jobs: environment: ${{ secrets.POSTMAN_ENVIRONMENT }} - name: Merge test -> main - uses: devmasx/merge-branch@master + uses: devmasx/merge-branch@v1.4.0 with: type: now from_branch: test From 9b4cd265bf1ccf53a92e8e1194dece520134a7fc Mon Sep 17 00:00:00 2001 From: Maxi Montenegro Date: Fri, 10 Jun 2022 20:55:26 -0300 Subject: [PATCH 2/2] add another change --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index 9d4507b..29d9e8f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -12,7 +12,7 @@ app.use(cors()); const port = process.env.PORT || 4000; app.get('/', (_req, res) => { - res.send('Hello World!!!!'); + res.send('Hello World!!!!!'); }); db.connectDB();