Skip to content

Commit

Permalink
Merge pull request #2333 from posit-dev/kg-extract-dist
Browse files Browse the repository at this point in the history
Extract dist rather than running just package
  • Loading branch information
kgartland-rstudio authored Oct 1, 2024
2 parents 783cb8a + 3cd025c commit 7e07f78
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 3 deletions.
22 changes: 20 additions & 2 deletions .github/workflows/contract.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobs:
sparse-checkout: bundles
sparse-checkout-cone-mode: false
token: ${{ secrets.CONNECT_PAT }}

- name: Install deps on ubuntu
run: |
sudo apt-get install libcurl4-openssl-dev libsodium-dev libfontconfig1-dev libfribidi-dev libfontconfig1-dev libpng-dev
Expand All @@ -58,7 +59,8 @@ jobs:
R.exe -e "install.packages('renv', repos='https://packagemanager.posit.co/cran/latest')"
if: matrix.runs-on == 'windows-latest'
- name: Install deps on macos
run: R -e "install.packages('renv', repos='https://packagemanager.posit.co/cran/latest')"
run: |
R -e "install.packages('renv', repos='https://packagemanager.posit.co/cran/latest')"
if: matrix.runs-on == 'macos-latest'

- run: chmod -R +x ./bin
Expand Down Expand Up @@ -105,6 +107,11 @@ jobs:
name: bin
path: bin

- uses: actions/download-artifact@v4
with:
name: dist
path: dist

- uses: actions/checkout@v4
with:
repository: rstudio/connect-content
Expand All @@ -113,11 +120,22 @@ jobs:
sparse-checkout-cone-mode: false
token: ${{ secrets.CONNECT_PAT }}

- name: Extract dist on ubuntu
run: |
unzip dist/*-linux-amd64.vsix -d dist/ext
if: matrix.runs-on == 'ubuntu-latest'
- name: Extract dist on windows
run: |
7z x -y dist/*-windows-amd64.vsix -odist/ext
if: matrix.runs-on == 'windows-latest'
- name: Extract dist on macos
run: |
unzip dist/*-darwin-amd64.vsix -d dist/ext
if: matrix.runs-on == 'macos-latest'
- run: chmod -R +x ./bin
- run: echo "${FUZZBUCKET_SSH_KEY}" > test/fuzzbucket-ssh-key && chmod 600 test/fuzzbucket-ssh-key

# vscode ui tests
- run: just package
- run: just vscode configure
- run: just vscode-ui install
- run: python --version
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ jobs:
secrets: inherit
uses: ./.github/workflows/contract-deps.yaml
nightly:
needs: [build, contract-deps]
needs:
- build
- contract-deps
- package
secrets: inherit
uses: ./.github/workflows/contract.yaml
with:
Expand Down

0 comments on commit 7e07f78

Please sign in to comment.