Merge pull request #12 from vim-denops/support-denops-v7

Support denops v7

.github/workflows/build.yml

@@ -9,15 +9,15 @@ on:
       denops_version:
         description: Denops version
         required: false
-        default: "v5.0.0"  # or "main"
+        default: "main"
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: docker/setup-buildx-action@v1
-      - uses: docker/login-action@v1
+      - uses: actions/checkout@v4
+      - uses: docker/setup-buildx-action@v3
+      - uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -26,7 +26,7 @@ jobs:
         id: vars
         run: |
           if [[ -z "${{ github.event.inputs.denops_version }}" ]]; then
-            echo '::set-output name=DENOPS_VERSION::v5.0.0'
+            echo '::set-output name=DENOPS_VERSION::main'
           else
             echo '::set-output name=DENOPS_VERSION::${{ github.event.inputs.denops_version }}'
           fi

Dockerfile.neovim

@@ -42,12 +42,8 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
       unzip \
       git
 
-ARG DENO_VERSION=v1.32.0
-WORKDIR /working
-RUN curl -sSL -O https://github.com/denoland/deno/releases/download/${DENO_VERSION}/deno-x86_64-unknown-linux-gnu.zip \
- && unzip deno-x86_64-unknown-linux-gnu.zip
-RUN mkdir -p /opt/deno/bin \
- && mv deno /opt/deno/bin/deno
+ARG DENO_VERSION=v1.45.0
+RUN curl -fsSL https://deno.land/install.sh | DENO_INSTALL=/opt/deno sh -s ${DENO_VERSION}
 
 
 #------------------------------------------------------------------------------------------------------------
@@ -92,7 +88,8 @@ COPY --from=deno /opt/deno /opt/deno
 COPY --from=denops /denops.vim /root/.local/share/nvim/site/pack/denops/start/denops.vim
 
 # Install denops.vim
-WORKDIR /root/.local/share/nvim/site/pack/denops/start
-RUN deno cache --unstable --no-check=remote */denops/**/*.ts
+WORKDIR /root/.local/share/nvim/site/pack/denops/start/denops.vim
+RUN deno cache denops/**/*.ts
+WORKDIR /root/.vim/pack/denops/start
 
 ENTRYPOINT ["/opt/neovim/bin/nvim"]

Dockerfile.vim

@@ -39,12 +39,8 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
       unzip \
       git
 
-ARG DENO_VERSION=v1.32.0
-WORKDIR /working
-RUN curl -sSL -O https://github.com/denoland/deno/releases/download/${DENO_VERSION}/deno-x86_64-unknown-linux-gnu.zip \
- && unzip deno-x86_64-unknown-linux-gnu.zip
-RUN mkdir -p /opt/deno/bin \
- && mv deno /opt/deno/bin/deno
+ARG DENO_VERSION=v1.45.0
+RUN curl -fsSL https://deno.land/install.sh | DENO_INSTALL=/opt/deno sh -s ${DENO_VERSION}
 
 
 #------------------------------------------------------------------------------------------------------------
@@ -89,7 +85,8 @@ COPY --from=deno /opt/deno /opt/deno
 COPY --from=denops /denops.vim /root/.vim/pack/denops/start/denops.vim
 
 # Install denops.vim
+WORKDIR /root/.vim/pack/denops/start/denops.vim
+RUN deno cache denops/**/*.ts
 WORKDIR /root/.vim/pack/denops/start
-RUN deno cache --unstable --no-check=remote */denops/**/*.ts
 
 ENTRYPOINT ["/opt/vim/bin/vim"]