Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into add_xcbeautify
Browse files Browse the repository at this point in the history
* origin/main: (2188 commits)
  bump(terraform-ls): update to v0.36.3 (#8291)
  bump(elp): update to v2024-12-09 (#8167)
  bump(sonarlint-language-server): update to v4.14.0 (#8122)
  bump(php-cs-fixer): update to v3.65.0 (#8027)
  bump(swiftlint): update to v0.57.1 (#8024)
  bump(ada-language-server): update to v26 (#7970)
  bump(jdtls): update to v1.43.0 (#8066)
  bump(stylua): update to v2 (#7959)
  chore(cuepls): add deprecation message (#8285)
  bump(pretty-php): update to v0.4.82 (#8286)
  bump(jdtls): upgrade 1.41.0 -> 1.42.0 (#8072)
  bump(clojure-lsp): update to v2024.11.08-17.49.29 (#7896)
  bump(haskell-language-server): Update to version 2.9.0.1 (#7929)
  bump(cpptools): update to v1.22.11 (#7552)
  bump(erlang-ls): update to v1 (#7405)
  bump(nimlangserver): update to v1.6.0 (#7316)
  fix(harper-ls): change filename to `-msvc` from `-gnu` (#7536)
  bump(codelldb): update to v1.11.1 (#7448)
  bump(steep): update to v1.9.2 (#7376)
  bump(slang): update to v2024.17 (#6445)
  ...
  • Loading branch information
williamboman committed Dec 20, 2024
2 parents 3bfa969 + 7bbaacd commit 9b3eefe
Show file tree
Hide file tree
Showing 335 changed files with 921 additions and 2,111 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/actionlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ on:

jobs:
validate:
name: Actionlint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: reviewdog/action-actionlint@v1
19 changes: 0 additions & 19 deletions .github/workflows/package-lint.yaml

This file was deleted.

105 changes: 13 additions & 92 deletions .github/workflows/package-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,99 +11,20 @@ on:
required: true

jobs:
package-diff:
name: Check package diffs
lint:
name: Registry lint
runs-on: ubuntu-latest
outputs:
all_changed_files: ${{ steps.changed-packages.outputs.all_changed_files }}
any_changed: ${{ steps.changed-packages.outputs.any_changed }}

steps:
- uses: actions/checkout@v3
- name: Get changed package definitions
id: changed-packages
uses: tj-actions/changed-files@v36
with:
files: |
packages/**/package.yaml
validate:
name: Validate package definitions
runs-on: ubuntu-latest
needs: package-diff
if: ${{ github.event.inputs.packages || needs.package-diff.outputs.any_changed == 'true' }}
steps:
- uses: actions/checkout@v3
- uses: mason-org/actions/validate-schema@v1
- uses: actions/checkout@v4
with:
packages: ${{ github.event.inputs.packages || needs.package-diff.outputs.all_changed_files }}

tests:
name: Test packages
needs: [package-diff, validate]
if: ${{ github.event.inputs.packages || needs.package-diff.outputs.any_changed == 'true' }}
strategy:
fail-fast: false
matrix:
# If making changes remember to update the manual workflow as well.
target:
- darwin_arm64
- darwin_x64
- linux_arm
- linux_arm64
- linux_arm64_gnu
- linux_arm_gnu
- linux_x64
- linux_x64_gnu
- linux_x86
- win_arm
- win_arm64
- win_x64
- win_x86

include:
- target: linux_x64
runs-on: ubuntu-latest
- target: linux_x64_gnu
runs-on: ubuntu-latest
- target: linux_x86
runs-on: ubuntu-latest
- target: linux_arm
runs-on: ubuntu-latest
- target: linux_arm_gnu
runs-on: ubuntu-latest
- target: linux_arm64
runs-on: ubuntu-latest
- target: linux_arm64_gnu
runs-on: ubuntu-latest
- target: darwin_x64
runs-on: macos-latest
- target: darwin_arm64
runs-on: macos-latest
- target: win_x64
runs-on: windows-latest
- target: win_x86
runs-on: windows-latest
- target: win_arm64
runs-on: windows-latest
- target: win_arm
runs-on: windows-latest

runs-on: ${{ matrix.runs-on }}
steps:
- uses: actions/checkout@v3
- uses: mason-org/actions/tests@v1
fetch-depth: 1
- uses: mason-org/actions/registry-lint@v1
with:
packages: ${{ github.event.inputs.packages || needs.package-diff.outputs.all_changed_files }}
target: ${{ matrix.target }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# This job is used for branch protection rule
# Add this job to `Status checks that are required`
status-check:
name: Status check
runs-on: ubuntu-latest
needs: tests
if: 'failure() || cancelled()'
steps:
- run: exit 1
packages: ${{ github.event.inputs.packages }}

test:
name: Package tests
needs: lint
uses: mason-org/actions/.github/workflows/package-tests.yaml@v1
with:
packages: ${{ github.event.inputs.packages }}
65 changes: 1 addition & 64 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,77 +3,14 @@ name: Release

on:
push:
tags:
- "**"
branches:
- main

jobs:
tag:
name: Tag
runs-on: ubuntu-latest
permissions:
contents: write
outputs:
tag: ${{ steps.tag.outputs.tag }}
should-release: ${{ steps.tag.outputs.should-release }}

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 2
- id: adjnoun
uses: mason-org/actions/adj-noun-generator@v1
- id: tag
name: Get/create tag
shell: bash
run: |
if [[ $GITHUB_REF =~ ^refs/tags ]]; then
echo "Releasing tag $GITHUB_REF_NAME"
printf "tag=%s\nshould-release=true" "$GITHUB_REF_NAME" >> "$GITHUB_OUTPUT"
elif [[ $(git diff-tree --name-only --no-commit-id HEAD -- packages | wc -l) -gt 0 ]]; then
declare TAG
TAG=$(date +%Y-%m-%d)-$ADJNOUN
printf "tag=%s\nshould-release=true" "$TAG" >> "$GITHUB_OUTPUT"
echo "Tagging and pushing $TAG"
git tag "$TAG" HEAD
git push origin "$TAG"
else
echo "No tag was pushed, and no package definition was changed."
echo "should-release=false" >> "$GITHUB_OUTPUT"
fi
env:
GITHUB_REF: ${{ github.ref }}
GITHUB_REF_NAME: ${{ github.ref_name }}
ADJNOUN: ${{ steps.adjnoun.outputs.word }}

release:
needs: [tag]
if: ${{ needs.tag.outputs.should-release == 'true' }}
name: Release
runs-on: ubuntu-latest
permissions:
contents: write

steps:
- uses: actions/checkout@v3
- name: Set up yq
shell: bash
run: |
sudo curl -fL "https://github.com/mikefarah/yq/releases/download/v4.30.6/yq_linux_amd64" -o /usr/local/bin/yq
sudo chmod +x /usr/local/bin/yq
- name: Compile
shell: bash
run: |
yq ea '[.]' -o json packages/*/package.yaml > registry.json
zip -r registry.json.zip registry.json
sha256sum registry.json registry.json.zip > checksums.txt
- name: Release
uses: softprops/action-gh-release@v1
with:
tag_name: ${{ needs.tag.outputs.tag }}
fail_on_unmatched_files: true
generate_release_notes: false
files: |
registry.json.zip
checksums.txt
- uses: mason-org/actions/registry-release@v1
5 changes: 3 additions & 2 deletions .github/workflows/validate-renovate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ on:

jobs:
validate:
name: Validate renovate config
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Check for config changes
id: diff
uses: tj-actions/changed-files@v36
uses: tj-actions/changed-files@v44
with:
files: |
renovate.json5
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
# Schema

Package definitions are validated against a well-defined [JSON schema](./schemas/). The full schema is hosted on
<http://schemastore.org/>.
Package definitions are validated against a well-defined [JSON schema](https://github.com/mason-org/registry-schema).
The full schema is hosted on <http://schemastore.org/>.

> [!TIP]
> Use [b0o/SchemaStore.nvim](https://github.com/b0o/SchemaStore.nvim) and the [YAML language
Expand Down
2 changes: 1 addition & 1 deletion packages/actionlint/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ categories:
- Linter

source:
id: pkg:github/rhysd/[email protected].1
id: pkg:github/rhysd/[email protected].4
asset:
- target: darwin_x64
file: actionlint_{{ version | strip_prefix "v" }}_darwin_amd64.tar.gz
Expand Down
51 changes: 43 additions & 8 deletions packages/ada-language-server/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,54 @@ categories:
- LSP

source:
id: pkg:github/AdaCore/ada_language_server@24.0.5
id: pkg:github/AdaCore/ada_language_server@26.0.202411173
asset:
- target: [darwin_x64, darwin_arm64]
file: als-{{version}}-macOS_amd64.zip
bin: x64/darwin/ada_language_server
- target: darwin_x64
file: als-{{version}}-darwin-x64.tar.gz
bin: integration/vscode/ada/x64/darwin/ada_language_server
- target: darwin_arm64
file: als-{{version}}-darwin-arm64.tar.gz
bin: integration/vscode/ada/arm64/darwin/ada_language_server
- target: linux_arm64_gnu
file: als-{{version}}-linux-arm64.tar.gz
bin: integration/vscode/ada/arm64/linux/ada_language_server
- target: linux_x64_gnu
file: als-{{version}}-Linux_amd64.zip
bin: x64/linux/ada_language_server
file: als-{{version}}-linux-x64.tar.gz
bin: integration/vscode/ada/x64/linux/ada_language_server
- target: win_x64
file: als-{{version}}-Windows_amd64.zip
bin: x64/win32/ada_language_server.exe
file: als-{{version}}-win32-x64.tar.gz
bin: integration/vscode/ada/x64/win32/ada_language_server.exe

version_overrides:
- constraint: semver:<=25.0.20241014
id: pkg:github/AdaCore/[email protected]
asset:
- target: darwin_x64
file: x64-darwin.tar.gz
bin: integration/vscode/ada/x64/darwin/ada_language_server
- target: darwin_arm64
file: arm64-darwin.tar.gz
bin: integration/vscode/ada/arm64/darwin/ada_language_server
- target: linux_x64_gnu
file: x64-linux.tar.gz
bin: integration/vscode/ada/x64/linux/ada_language_server
- target: win_x64
file: x64-win32.tar.gz
bin: integration/vscode/ada/x64/win32/ada_language_server.exe

- constraint: semver:<=24.0.6
id: pkg:github/AdaCore/[email protected]
asset:
- target: [darwin_x64, darwin_arm64]
file: als-{{version}}-macOS_amd64.zip
bin: x64/darwin/ada_language_server
- target: linux_x64_gnu
file: als-{{version}}-Linux_amd64.zip
bin: x64/linux/ada_language_server
- target: win_x64
file: als-{{version}}-Windows_amd64.zip
bin: x64/win32/ada_language_server.exe

- constraint: semver:<=23.0.19
id: pkg:github/AdaCore/[email protected]
asset:
Expand Down
18 changes: 9 additions & 9 deletions packages/aiken/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@ categories:
- LSP

source:
id: pkg:github/aiken-lang/aiken@v1.0.26-alpha
id: pkg:github/aiken-lang/aiken@v1.1.9
asset:
- target: darwin_x64
file: aiken_{{ version }}_darwin_amd64.tar.gz
bin: aiken
file: aiken-x86_64-apple-darwin.tar.gz
bin: aiken-x86_64-apple-darwin/aiken
- target: darwin_arm64
file: aiken_{{ version }}_darwin_arm64.tar.gz
bin: aiken
file: aiken-aarch64-apple-darwin.tar.gz
bin: aiken-aarch64-apple-darwin/aiken
- target: linux_x64
file: aiken_{{ version }}_linux_amd64.tar.gz
bin: aiken
file: aiken-x86_64-unknown-linux-gnu.tar.gz
bin: aiken-x86_64-unknown-linux-gnu/aiken
- target: win_x64
file: aiken_{{ version }}_win32_amd64.zip
bin: aiken.exe
file: aiken-x86_64-pc-windows-msvc.tar.gz
bin: aiken-x86_64-pc-windows-msvc/aiken.exe

bin:
aiken: "{{source.asset.bin}}"
Loading

0 comments on commit 9b3eefe

Please sign in to comment.