Skip to content

Commit

Permalink
Merge branch 'main' into bom-scopes
Browse files Browse the repository at this point in the history
  • Loading branch information
lihaoyi authored Dec 14, 2024
2 parents 6bbbaca + a117b62 commit ac69ceb
Show file tree
Hide file tree
Showing 130 changed files with 2,702 additions and 1,159 deletions.
2 changes: 1 addition & 1 deletion .config/mill-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.12.3-41-d21946
0.12.3-66-40e41b
35 changes: 35 additions & 0 deletions .github/actions/post-build-setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# action.yml
inputs:
java-version:
required: true
type: string

timeout-minutes:
default: 60
type: number

os:
type: string

runs:
using: "composite"
steps:
- uses: actions/setup-java@v4
with:
java-version: ${{ inputs.java-version }}
distribution: temurin

- uses: actions/checkout@v4

# Need to fix cached artifact file permissions because github actions screws it up
# https://github.com/actions/upload-artifact/issues/38
- run: "chmod -R +x ."
shell: bash

- uses: coursier/cache-action@v6

- run: git config --global user.email "you@example.com"
shell: bash

- run: git config --global user.name "Your Name"
shell: bash
36 changes: 36 additions & 0 deletions .github/workflows/post-build-raw.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: post-build-raw
on:
workflow_call:
inputs:
buildcmd:
default: ''
type: string
java-version:
required: true
type: string
os:
default: 'ubuntu-latest'
type: string
timeout-minutes:
default: 60
type: number

jobs:
run:
runs-on: ${{ inputs.os }}
continue-on-error: false
timeout-minutes: ${{ inputs.timeout-minutes }}
steps:
- uses: actions/checkout@v4

- uses: ./.github/actions/post-build-setup
with:
java-version: ${{ inputs.java-version }}
os: ${{ inputs.os }}

- uses: actions/download-artifact@v4
with:
path: .
name: ${{ inputs.os }}-artifact

- run: ${{ inputs.buildcmd }}
64 changes: 64 additions & 0 deletions .github/workflows/post-build-selective.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: post-build-selective
on:
workflow_call:
inputs:
millargs:
default: ''
type: string
java-version:
required: true
type: string
os:
default: 'ubuntu-latest'
type: string
timeout-minutes:
default: 60
type: number
install-android-sdk:
default: false
type: boolean

jobs:
run:
runs-on: ${{ inputs.os }}
continue-on-error: false
timeout-minutes: ${{ inputs.timeout-minutes }}
steps:
- uses: actions/checkout@v4

- uses: ./.github/actions/post-build-setup
with:
java-version: ${{ inputs.java-version }}
os: ${{ inputs.os }}

- uses: actions/download-artifact@v4
with:
path: .
name: ${{ inputs.os }}-artifact

- run: chmod -R 777 . # normalize permissions before and after upload/download-artifact

- uses: actions/download-artifact@v4
with:
path: out/mill-selective-execution
name: ${{ inputs.os }}-selective-execution-artifact

- run: mv out/mill-selective-execution/mill-selective-execution.json out/mill-selective-execution.json

- uses: actions/setup-node@v4
with:
node-version: '22'

- uses: android-actions/setup-android@v3
if: ${{ inputs.install-android-sdk }}
with:
log-accepted-android-sdk-licenses: false

- run: ./mill -i -k selective.resolve ${{ inputs.millargs }}

- run: ./mill -i -k selective.run ${{ inputs.millargs }}

- run: 'taskkill -f -im java* && rm -rf out/mill-server/*'
if: startsWith(inputs.os, 'windows')
shell: bash
continue-on-error: true
57 changes: 57 additions & 0 deletions .github/workflows/pre-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
on:
workflow_call:
inputs:
compileargs:
default: '__.compile'
type: string
prepareargs:
default: '__.test'
type: string
java-version:
default: '11'
type: string
os:
type: string
timeout-minutes:
default: 60
type: number

jobs:
run:
runs-on: ${{ inputs.os }}
timeout-minutes: ${{ inputs.timeout-minutes }}
steps:
- uses: actions/setup-java@v4
with:
java-version: ${{ inputs.java-version }}
distribution: temurin

- uses: actions/checkout@v4
with:
ref: ${{ github.base_ref }}

- run: chmod -R 777 . # normalize permissions before and after upload/download-artifact

- run: mkdir out && touch out/mill-selective-execution.json
shell: bash

- run: ./mill -i -k selective.prepare ${{ inputs.prepareargs }}
if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'run-all-tests') }}

- uses: actions/upload-artifact@v4.4.3
with:
path: out/mill-selective-execution.json
name: ${{ inputs.os }}-selective-execution-artifact
include-hidden-files: true

- uses: actions/checkout@v4

- uses: coursier/cache-action@v6

- run: ./mill -i -k ${{ inputs.compileargs }}

- uses: actions/upload-artifact@v4.4.3
with:
path: .
name: ${{ inputs.os }}-artifact
include-hidden-files: true
5 changes: 4 additions & 1 deletion .github/workflows/publish-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ jobs:
# when in master repo, publish all tags and manual runs on main
if: github.repository == 'com-lihaoyi/mill'
runs-on: ubuntu-latest

env:
MILL_STABLE_VERSION: 1
steps:
- uses: actions/checkout@v4
with: {fetch-depth: 0}
Expand Down Expand Up @@ -56,6 +57,7 @@ jobs:
concurrency: publish-sonatype-${{ github.sha }}

env:
MILL_STABLE_VERSION: 1
MILL_SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
MILL_SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
MILL_PGP_SECRET_BASE64: ${{ secrets.SONATYPE_PGP_SECRET }}
Expand Down Expand Up @@ -93,6 +95,7 @@ jobs:
runs-on: ubuntu-latest

env:
MILL_STABLE_VERSION: 1
REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}

steps:
Expand Down
40 changes: 0 additions & 40 deletions .github/workflows/publish-bridges.yml

This file was deleted.

102 changes: 0 additions & 102 deletions .github/workflows/run-mill-action.yml

This file was deleted.

Loading

0 comments on commit ac69ceb

Please sign in to comment.