diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 35fae07..3dec5de 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,7 +2,7 @@ name: Deploy to S3 and CloudFront on: push: - branches: ['master'] + branches: ['chore/02130900-jode-gitActions'] jobs: deploy: @@ -24,11 +24,20 @@ jobs: aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }} aws-region: ap-northeast-2 +<<<<<<< Updated upstream - uses: actions/checkout@v3 - name: Use Node.js uses: actions/setup-node@v3 with: node-version: '15.x' +======= + - uses: actions/checkout@v4 + - name: Use Node.js + uses: actions/setup-node@v4 + with: + node-version: 18 + +>>>>>>> Stashed changes - name: Install dependencies run: | if [ -e yarn.lock ]; then diff --git a/package.json b/package.json index 22c14b8..0bde187 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,6 @@ "browserslist": { "production": [ ">0.2%", - "not dead", "not op_mini all" ], "development": [ @@ -43,7 +42,6 @@ }, "devDependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.21.11", - "@babel/plugin-transform-parameters": "^7.25.9", "prettier": "2.7.1" } }