diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d4d1d6416..fe691abcf 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,7 +1,10 @@ name: Docker on: + pull_request: + branches: [ "main" ] push: + branches: [ "main" ] tags: - v* workflow_dispatch: @@ -34,6 +37,7 @@ jobs: type=raw,value=${{ inputs.tag }},event=workflow_dispatch type=schedule,pattern=nightly type=semver,pattern={{version}} + type=ref,event=pr - name: Depot setup uses: depot/setup-action@v1 @@ -53,7 +57,7 @@ jobs: context: . file: ./Dockerfile platforms: linux/amd64,linux/arm/v7,linux/arm64 - push: true + push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.docker_meta.outputs.tags }} labels: ${{ steps.docker_meta.outputs.labels }} build-args: | diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index a8c6aeb77..23ae3c7b6 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,8 +1,10 @@ name: Ruby on: - - push - - pull_request + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] jobs: test: diff --git a/Dockerfile b/Dockerfile index 0b41a28ad..fadc9c093 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ WORKDIR /usr/src/app COPY package.json . COPY yarn.lock . RUN yarn config set network-timeout 600000 -g -RUN yarn install --prod +RUN yarn install RUN gem install bundler -v 2.4.13 RUN bundle config set --local deployment 'true' diff --git a/package.json b/package.json index 806952491..56d592c08 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,9 @@ "i18n-js": "^4.4.3", "jquery": "^3.7.1", "masonry-layout": "^4.2.2", - "three": "^0.162.0" + "three": "^0.162.0", + "esbuild": "^0.20.1", + "sass": "^1.71.1" }, "version": "0.1.0", "devDependencies": { @@ -31,10 +33,8 @@ "@types/three": "^0.162.0", "@types/webpack-env": "^1.18.4", "@typescript-eslint/parser": "^7.1.0", - "esbuild": "^0.20.1", "eslint": "^8.57.0", "husky": "^9.0.11", - "sass": "^1.71.1", "ts-standard": "^12.0.2", "typescript": "^5.3.3" }