From 100be30b413cca4c82fef05940865ac659d422d1 Mon Sep 17 00:00:00 2001 From: Nate Date: Fri, 6 Dec 2024 08:37:31 -0800 Subject: [PATCH] test macos-14 --- .github/workflows/main.yaml | 4 +- .github/workflows/preview.yaml | 191 +++++++++++++++++---------------- 2 files changed, 99 insertions(+), 96 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index b73cdb3ad2..f54d7bbe4f 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -49,11 +49,11 @@ jobs: platform: alpine arch: x64 npm_config_arch: x64 - - os: macos-12 # should migrate this to the newer x64 version of macos-14 + - os: macos-14 platform: darwin arch: x64 npm_config_arch: x64 - - os: macos-12 # same here, especially + - os: macos-14 # same here, especially platform: darwin arch: arm64 npm_config_arch: arm64 diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index a65e79c7f5..7f50f37bf7 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -1,8 +1,11 @@ name: Publish Preview Extension on: - release: - types: [prereleased] + push: + branches: + - nate/mac-14-ci + # release: + # types: [prereleased] jobs: check_release_name: @@ -49,11 +52,11 @@ jobs: platform: alpine arch: x64 npm_config_arch: x64 - - os: macos-12 # should migrate this to the newer x64 version of macos-14 + - os: macos-14 platform: darwin arch: x64 npm_config_arch: x64 - - os: macos-12 # same here, especially + - os: macos-14 platform: darwin arch: arm64 npm_config_arch: arm64 @@ -161,93 +164,93 @@ jobs: name: ${{ env.target }}-vsix path: "extensions/vscode/*.vsix" - release: - permissions: - contents: write - runs-on: ubuntu-latest - needs: - - build - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up Git - run: | - git config --local user.email "action@github.com" - git config --local user.name "GitHub Action" - - # Download the .vsix artifacts - - uses: actions/download-artifact@v4 - with: - pattern: "*-vsix" - path: vsix-artifacts - merge-multiple: true - - - name: Release - uses: softprops/action-gh-release@v2 - with: - tag_name: ${{ github.ref_name }} - files: | - vsix-artifacts/*.vsix - token: ${{ secrets.CI_GITHUB_TOKEN }} - repository: continuedev/continue - prerelease: true - - publish: - runs-on: ubuntu-latest - needs: - - build - permissions: - contents: write - steps: - # 0. Setup git - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up Git - run: | - git config --local user.email "action@github.com" - git config --local user.name "GitHub Action" - - - name: Pull latest changes - run: git pull origin main - - # 1. Download the artifacts - - uses: actions/download-artifact@v4 - with: - pattern: "*-vsix" - path: vsix-artifacts - merge-multiple: true - - # 2. Publish the extension to VS Code Marketplace - - name: Publish to VS Code Marketplace - run: | - cd extensions/vscode - npx vsce publish --pre-release --packagePath ../../vsix-artifacts/*.vsix - env: - VSCE_PAT: ${{ secrets.VSCE_TOKEN }} - - # 3. Publish the extension to Open VSX Registry - - name: Publish (Open VSX Registry) - continue-on-error: true - run: | - cd extensions/vscode - npx ovsx publish --pre-release -p ${{ secrets.VSX_REGISTRY_TOKEN }} --packagePath ../../vsix-artifacts/*.vsix - - # 4. Update the package.json version and push changes - # - name: Update version in package.json - # run: | - # cd extensions/vscode - # npm version patch - - # - name: Commit changes - # run: | - # git config --local user.email "action@github.com" - # git config --local user.name "GitHub Action" - # git commit -am "💚 Update package.json version [skip ci]" - - # - name: Push changes - # uses: ad-m/github-push-action@master - # with: - # github_token: ${{ secrets.GITHUB_TOKEN }} - # branch: ${{ github.ref }} + # release: + # permissions: + # contents: write + # runs-on: ubuntu-latest + # needs: + # - build + # steps: + # - name: Checkout + # uses: actions/checkout@v4 + + # - name: Set up Git + # run: | + # git config --local user.email "action@github.com" + # git config --local user.name "GitHub Action" + + # # Download the .vsix artifacts + # - uses: actions/download-artifact@v4 + # with: + # pattern: "*-vsix" + # path: vsix-artifacts + # merge-multiple: true + + # - name: Release + # uses: softprops/action-gh-release@v2 + # with: + # tag_name: ${{ github.ref_name }} + # files: | + # vsix-artifacts/*.vsix + # token: ${{ secrets.CI_GITHUB_TOKEN }} + # repository: continuedev/continue + # prerelease: true + + # publish: + # runs-on: ubuntu-latest + # needs: + # - build + # permissions: + # contents: write + # steps: + # # 0. Setup git + # - name: Checkout + # uses: actions/checkout@v4 + + # - name: Set up Git + # run: | + # git config --local user.email "action@github.com" + # git config --local user.name "GitHub Action" + + # - name: Pull latest changes + # run: git pull origin main + + # # 1. Download the artifacts + # - uses: actions/download-artifact@v4 + # with: + # pattern: "*-vsix" + # path: vsix-artifacts + # merge-multiple: true + + # # 2. Publish the extension to VS Code Marketplace + # - name: Publish to VS Code Marketplace + # run: | + # cd extensions/vscode + # npx vsce publish --pre-release --packagePath ../../vsix-artifacts/*.vsix + # env: + # VSCE_PAT: ${{ secrets.VSCE_TOKEN }} + + # # 3. Publish the extension to Open VSX Registry + # - name: Publish (Open VSX Registry) + # continue-on-error: true + # run: | + # cd extensions/vscode + # npx ovsx publish --pre-release -p ${{ secrets.VSX_REGISTRY_TOKEN }} --packagePath ../../vsix-artifacts/*.vsix + + # 4. Update the package.json version and push changes + # - name: Update version in package.json + # run: | + # cd extensions/vscode + # npm version patch + + # - name: Commit changes + # run: | + # git config --local user.email "action@github.com" + # git config --local user.name "GitHub Action" + # git commit -am "💚 Update package.json version [skip ci]" + + # - name: Push changes + # uses: ad-m/github-push-action@master + # with: + # github_token: ${{ secrets.GITHUB_TOKEN }} + # branch: ${{ github.ref }}