Skip to content

Commit

Permalink
Merge branch 'main' into parent
Browse files Browse the repository at this point in the history
  • Loading branch information
maelle authored Feb 13, 2025
2 parents bd92a5f + da62f3d commit bd65a35
Show file tree
Hide file tree
Showing 35 changed files with 1,188 additions and 445 deletions.
56 changes: 31 additions & 25 deletions .github/workflows/vendor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ on:
branches:
- main
paths:
- ".github/workflows/vendor.yml"
- ".github/workflows/vendor.yaml"
- "vendor-one.sh"
workflow_dispatch:
schedule:
- cron: "* 2 * * *"
- cron: "*/5 * * * *"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || github.sha }}-${{ github.base_ref || '' }}
cancel-in-progress: true
group: ${{ github.workflow }}

name: vendor

Expand All @@ -24,6 +24,8 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/checkout@v4
with:
Expand All @@ -33,30 +35,34 @@ jobs:

- uses: ./.github/workflows/git-identity

- uses: ./.github/workflows/custom/before-install
if: hashFiles('.github/workflows/custom/before-install/action.yml') != ''

- uses: ./.github/workflows/install
with:
cache-version: rcc-vendor
token: ${{ secrets.GITHUB_TOKEN }}
install-r: false
cache-version: vendor
needs: check
extra-packages: any::rcmdcheck, cpp11, decor

- uses: ./.github/workflows/custom/after-install
if: hashFiles('.github/workflows/custom/after-install/action.yml') != ''

- run: |
git checkout -- .
git clean -fdx
tools/update-cigraph.sh .git/igraph
rm -rf .git/igraph

- uses: ./.github/workflows/check
with:
results: ${{ runner.os }}-smoke-test
- name: Vendor sources
id: vendor
run: |
git pull --rebase
./vendor-one.sh .git/igraph
rm -rf .git/igraph
git push --dry-run
# Check if ahead of upstream branch
# If yes, set a step output
if [ $(git rev-list HEAD...origin/main --count) -gt 0 ]; then
# Avoid set-output, it's deprecated
echo "vendor=ok" >> "$GITHUB_OUTPUT"
fi
- if: github.event_name != 'pull_request'
- name: Create PR
if: steps.vendor.outputs.vendor != ''
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git push -u origin HEAD
set -x
git checkout -b vendor
if git push -u origin HEAD; then
gh pr create --fill-first
gh workflow run rcc -f ref=vendor
gh pr merge --auto --squash
fi
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: igraph
Title: Network Analysis and Visualization
Version: 2.1.3.9001
Version: 2.1.4.9010
Authors@R: c(
person("Gábor", "Csárdi", , "[email protected]", role = "aut",
comment = c(ORCID = "0000-0001-7098-9676")),
Expand Down
Loading

0 comments on commit bd65a35

Please sign in to comment.