Mercurial > octave
changeset 32959:489aead3a0f5 stable
merge away extra head on stable
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 07 Feb 2024 11:47:40 -0500 |
| parents | e5874e36a725 (current diff) 98b34c7f7d73 (diff) |
| children | 30cef7f54d81 476a7ecc1f4c |
| files | |
| diffstat | 3 files changed, 34 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/.github/workflows/codeql-analysis.yaml Wed Feb 07 02:24:19 2024 -0500 +++ b/.github/workflows/codeql-analysis.yaml Wed Feb 07 11:47:40 2024 -0500 @@ -21,7 +21,7 @@ steps: - name: checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: install dependencies run: | @@ -150,7 +150,7 @@ msystem: ${{ matrix.msystem }} - name: checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: bootstrap run: ./bootstrap
--- a/.github/workflows/make.yaml Wed Feb 07 02:24:19 2024 -0500 +++ b/.github/workflows/make.yaml Wed Feb 07 11:47:40 2024 -0500 @@ -51,7 +51,7 @@ steps: - name: checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: install dependencies env: @@ -80,7 +80,7 @@ - name: restore ccache # setup the github cache used to maintain the ccache from one job to the next - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: path: ~/.ccache key: ${{ steps.ccache-prepare.outputs.key }} @@ -133,7 +133,7 @@ - name: save ccache # Save the cache after we are done (successfully) building - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 with: path: ~/.ccache key: ${{ steps.ccache-prepare.outputs.key }} @@ -197,7 +197,7 @@ cat /proc/cpuinfo - name: checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: install dependencies uses: jirutka/setup-alpine@v1 @@ -281,7 +281,7 @@ - name: restore ccache # setup the github cache used to maintain the ccache from one job to the next - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: # location of the ccache of the chroot in the root file system path: /home/runner/rootfs/alpine-latest-x86/home/runner/.ccache @@ -356,7 +356,7 @@ - name: save ccache # Save the cache after we are done (successfully) building - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 with: path: /home/runner/rootfs/alpine-latest-x86/home/runner/.ccache key: ${{ steps.ccache-prepare.outputs.key }} @@ -447,7 +447,7 @@ steps: - name: checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: install dependencies # This step sometimes takes long and still recovers. But sometimes it @@ -497,7 +497,7 @@ - name: restore ccache # setup the github cache used to maintain the ccache from one job to the next - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 id: restore-ccache with: path: /Users/runner/Library/Caches/ccache @@ -569,7 +569,7 @@ - name: save ccache # Save the cache after we are done (successfully) building - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 with: path: /Users/runner/Library/Caches/ccache key: ${{ steps.ccache-prepare.outputs.key }} @@ -734,7 +734,7 @@ msystem: ${{ matrix.msystem }} - name: checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: prepare ccache # create key with human readable timestamp @@ -747,7 +747,7 @@ - name: restore ccache # Setup the github cache used to maintain the ccache from one job to the next - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: path: ${{ steps.ccache-prepare.outputs.ccachedir }} key: ${{ steps.ccache-prepare.outputs.key }} @@ -806,7 +806,7 @@ - name: save ccache # Save the cache after we are done (successfully) building - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 with: path: ${{ steps.ccache-prepare.outputs.ccachedir }} key: ${{ steps.ccache-prepare.outputs.key }} @@ -903,10 +903,10 @@ - name: checkout repository # This must be done before installing Cygwin because their git is # incompatible with this action. - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: install Cygwin build environment - uses: cygwin/cygwin-install-action@v2 + uses: cygwin/cygwin-install-action@v4 with: # The packages are listed in (alphabetically sorted) blocks: # The first block is for mandatory dependencies. @@ -989,7 +989,7 @@ - name: restore ccache # Setup a github cache used to maintain the ccache from one run to the next - uses: actions/cache/restore@v3.2.2 + uses: actions/cache/restore@v4 with: path: ${{ steps.ccache-prepare.outputs.ccachedir }} key: ${{ steps.ccache-prepare.outputs.key }} @@ -1056,11 +1056,16 @@ - name: save ccache # Save the cache after we are done (successfully) building - uses: actions/cache/save@v3.2.2 + uses: actions/cache/save@v4 with: path: ${{ steps.ccache-prepare.outputs.ccachedir }} key: ${{ steps.ccache-prepare.outputs.key }} + - name: rebase binaries + run: | + find ${GITHUB_WORKSPACE}/.build -name "*.oct" -or -name "*.dll" -or -name "*.exe" | tee binaries.list + rebase -O -T binaries.list + - name: check # Continuing on error in this step means that jobs will be "green" even # if the test suite crashes. But if we don't continue, we'll loose the
--- a/libinterp/parse-tree/pt-eval.cc Wed Feb 07 02:24:19 2024 -0500 +++ b/libinterp/parse-tree/pt-eval.cc Wed Feb 07 11:47:40 2024 -0500 @@ -2256,7 +2256,6 @@ } } -// END is documented in op-kw-docs. DEFMETHOD (end, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {} end @@ -2290,17 +2289,17 @@ @item For custom classes, to enable use of @code{end} in indexing expressions it must be overloaded with a function definition such as: - @example - @group - function last_index = end (obj, end_dim, ndim_obj) - if (end_dim == ndim_obj) - last_index = prod (size (obj)(end_dim:ndim_obj)); - else - last_index = size (obj, end_dim); - endif - endfunction - @end group - @end example +@example +@group +function last_index = end (obj, end_dim, ndim_obj) + if (end_dim == ndim_obj) + last_index = prod (size (obj)(end_dim:ndim_obj)); + else + last_index = size (obj, end_dim); + endif +endfunction +@end group +@end example For more information see @ref{Object Oriented Programming, , Object Oriented Programming}. @end enumerate